Hopiu/micro
1
0
Fork 0
mirror of https://github.com/Hopiu/micro.git synced 2026-05-23 05:35:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #675 from benjamreynolds/patch-1

Browse source 
Cleanup from merge conflicts in syntax/README
This commit is contained in:
Zachary Yedidia 2017-05-19 16:25:59 -04:00 committed by GitHub
commit 61cea4624e
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 # Syntax Files
Here are micro's 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 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). under that license. See [LICENSE](LICENSE).
>>>>>>> master