diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index e274b379..00000000
--- a/.gitmodules
+++ /dev/null
@@ -1,4 +0,0 @@
-[submodule "submodules/ace"]
- path = submodules/ace
- url = https://github.com/ajaxorg/ace-builds.git
- branch = master
diff --git a/gruntfile.js b/gruntfile.js
index 6637d3d8..6b1c6b8b 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -100,7 +100,7 @@ module.exports = function (grunt) {
prune: true,
overwrite: true,
out: path.join(__dirname, 'dist'),
- ignore: /submodules\/ace\/(?!src-min)|submodules\/ace\/(?=src-min-noconflict)|node_modules\/devicon\/icons|dist|^\/browser|^\/secret|\.babelrc|\.gitignore|^\/\.gitmodules|^\/gruntfile|^\/readme.md|^\/webpack|^\/appdmg\.json|^\/node_modules\/grunt/
+ ignore: /node_modules\/ace-builds\/(?!src-min)|node_modules\/ace-builds\/(?=src-min-noconflict)|node_modules\/devicon\/icons|dist|^\/browser|^\/secret|\.babelrc|\.gitignore|^\/\.gitmodules|^\/gruntfile|^\/readme.md|^\/webpack|^\/appdmg\.json|^\/node_modules\/grunt/
}
switch (platform) {
case 'win':
diff --git a/lib/finder.html b/lib/finder.html
index f5ceb6f8..8f4d74db 100644
--- a/lib/finder.html
+++ b/lib/finder.html
@@ -27,7 +27,7 @@
-
+
diff --git a/lib/main.html b/lib/main.html
index 6803dea8..99e3b799 100644
--- a/lib/main.html
+++ b/lib/main.html
@@ -54,8 +54,8 @@
-
-
+
+
diff --git a/package.json b/package.json
index d2d99af8..e11d8bf3 100644
--- a/package.json
+++ b/package.json
@@ -40,6 +40,7 @@
"@rokt33r/markdown-it-math": "^4.0.1",
"@rokt33r/node-ipc": "^5.0.4",
"@rokt33r/sanitize-html": "^1.11.2",
+ "ace-builds": "git+https://git@github.com/ajaxorg/ace-builds.git",
"devicon": "^2.0.0",
"electron-gh-releases": "^2.0.2",
"font-awesome": "^4.3.0",
@@ -88,9 +89,6 @@
},
"optional": false,
"standard": {
- "ignore": [
- "submodules"
- ],
"globals": [
"localStorage"
]
diff --git a/readme.md b/readme.md
index 0224e38c..62a56460 100644
--- a/readme.md
+++ b/readme.md
@@ -2,6 +2,7 @@
Simple opensource note app for developer.
+<<<<<<< HEAD
- [日本語](./readme-ja.md)
- [한국어](./readme-ko.md)
@@ -12,6 +13,17 @@ We just want you to enjoying writing anything. :grinning:
- Target OS : OSX, Windows, Linux(also mobile somewhen!)
- Cloud : Google drive, Dropbox, One drive, iCloud...
- Remaining opensource forever!
+=======
+## !!v0.6.0 is Underconstruction!!
+
+Check the links below for further information.
+
+Progress summary
+https://github.com/BoostIO/Boostnote/issues/3
+
+v0.6.0 Branch
+https://github.com/BoostIO/Boostnote/tree/0.6.0
+>>>>>>> no_submodules
## Inspired by
diff --git a/submodules/ace b/submodules/ace
deleted file mode 160000
index 8dcfcd6d..00000000
--- a/submodules/ace
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8dcfcd6d0d6e0167f2282fa51308facc6f4fc46c