refs #1698 : bugifx - merge bug

-
Needlworks · Jan 7, 2015 · 61fb12e · 61fb12e
1 parent 25e32db
commit 61fb12e
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git a/plugins/ED_tinyMCE/tinymce/plugins/codemirror/CodeMirror/doc/manual.html b/plugins/ED_tinyMCE/tinymce/plugins/codemirror/CodeMirror/doc/manual.html
@@ -751,8 +751,6 @@ <h2>Keymaps</h2>
     map.</p>
 </section>
 
-<<<<<<< HEAD
-=======
 <section id=commands>
     <h2>Commands</h2>
 
@@ -938,7 +936,6 @@ <h2>Commands</h2>
 
 </section>
 
->>>>>>> 97b1153... Add insertSoftTab command
 <section id=styling>
     <h2>Customized Styling</h2>
 

diff --git a/plugins/ED_tinyMCE/tinymce/plugins/codemirror/CodeMirror/test/doc_test.js b/plugins/ED_tinyMCE/tinymce/plugins/codemirror/CodeMirror/test/doc_test.js
@@ -320,8 +320,6 @@
     eq(cleared, 1);
   });
 
-<<<<<<< HEAD
-=======
   testDoc("sharedMarkerCopy", "A='abcde'", function(a) {
     var shared = a.markText(Pos(0, 1), Pos(0, 3), {shared: true});
     var b = a.linkedDoc();
@@ -364,7 +362,6 @@
     eq(cleared, 1);
   });
 
->>>>>>> bc75b8f... Keep shared markers consistent when documents are linked/unlinked
   testDoc("undoInSubview", "A='line 0\nline 1\nline 2\nline 3\nline 4' B<A/1-4", function(a, b) {
     b.replaceRange("x", Pos(2, 0));
     a.undo();