Merge conflict fixed

This commit is contained in:
Paul Chaignon
2015-02-04 20:01:27 +01:00
5 changed files with 344 additions and 1 deletions

View File

@@ -200,6 +200,8 @@ vendor/grammars/dylan.tmbundle:
- source.makegen
vendor/grammars/ebundles/Bundles/MSDOS batch file.tmbundle:
- source.dosbatch
vendor/grammars/ec.tmbundle/:
- source.c.ec
vendor/grammars/eiffel.tmbundle:
- source.eiffel
vendor/grammars/elixir-tmbundle: