replace with electron

note.html

@@ -8,11 +8,7 @@
 <meta name=”apple-mobile-web-app-capable” content=”yes” />
 <meta name="keywords" content="leanote,leanote.com">
 <meta name="description" content="leanote, Not Just A Notepad!">
-<<<<<<< HEAD:src/note.html
-<title class="lang">Leanote, Not Just A Notepad!</title>
-=======
 <title class="lang">Leanote, Not Just A Notepad</title>
->>>>>>> electron:note.html
 
 <link href="public/css/bootstrap.css" rel="stylesheet" />
 <!-- 先加载, 没有样式, 宽度不定 -->
@@ -29,10 +25,6 @@
 <!-- mdeditor -->
 <link href="public/md/themes/default.css" rel="stylesheet" />
 
-<<<<<<< HEAD:src/note.html
-
-=======
->>>>>>> electron:note.html
 <!-- for change theme -->
 <link rel="stylesheet" href="" type="text/css" id="theme"/>
 
@@ -682,15 +674,7 @@ window.require = undefined;
 <script src="public/js/require.js"></script>
 <!-- 导入插件 执行 -->
 <script src="public/js/main.js"></script>
-<<<<<<< HEAD:src/note.html
-
-<script src="public/tinymce/plugins/leaui_image/public/js/jquery.ui.widget.js"></script>
-<script src="public/tinymce/plugins/leaui_image/public/js/jquery.fileupload.js"></script>
-<script src="public/tinymce/plugins/leaui_image/public/js/jquery.iframe-transport.js"></script>
-
-=======
 <!-- markdown editor -->
->>>>>>> electron:note.html
 <script src="public/md/main.js"></script>
 <!-- extra额外 -->
 <script src="public/js/dec/main.js"></script>
@@ -708,4 +692,4 @@ window.require = window.requireNode;
 })();
 </script>
 </body>
-</html>
+</html>