Fix zyedidia#1330: Dlang character syntax highlighting

[micro.git] / runtime / syntax / README.md

diff --git a/runtime/syntax/README.md b/runtime/syntax/README.md
index cb4df5ae93aed8c709737362d7b17d36a5723803..2d4e42dbf1fbd2e0dbe88d96f6b9271505b13644 100644 (file)
--- a/runtime/syntax/README.md
+++ b/runtime/syntax/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Syntax Files
 
 Here are micro's syntax files.
@@ -26,7 +25,7 @@ Most the the syntax files here have been converted using that tool.
 
 Note that the tool isn't perfect and though it is unlikely, you may run into some small issues that you will have to fix manually
 (about 4 files from this directory had issues after being converted).
-=======
+
 # Micro syntax highlighting files
 
 These are the syntax highlighting files for micro. To install them, just
@@ -67,4 +66,3 @@ Here is a list of the files that have been converted to properly use colorscheme
 
 Because the nano syntax files I have modified are distributed under the GNU GPLv3 license, these files are also distributed
 under that license. See [LICENSE](LICENSE).
->>>>>>> master