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

3
.gitmodules vendored
View File

@@ -591,3 +591,6 @@
[submodule "vendor/grammars/AutoHotkey"]
path = vendor/grammars/AutoHotkey
url = https://github.com/ahkscript/SublimeAutoHotkey
[submodule "vendor/grammars/ec.tmbundle"]
path = vendor/grammars/ec.tmbundle
url = https://github.com/ecere/ec.tmbundle