NeonXP/micro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Cleanup from merge conflicts in syntax/README

Browse source
This commit is contained in:
Benjamin Reynolds 2017-05-19 12:33:41 -05:00 committed by GitHub
parent e7ee194acf
commit 2899e47591
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
runtime/syntax/README.md
View file

@ -1,4 +1,3 @@
<<<<<<< HEAD
# Syntax Files
Here are micro's syntax files.
@ -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