fixing merge conflict

Browse Source

...

This commit is contained in:

Brandon Black

2017-02-21 16:28:34 -08:00

parent d58cbc68a6 9b08318456

commit 74a71fd90d

27 changed files with 2356 additions and 36 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

vendor/grammars/TXL

Vendored

+1 -1

Submodule vendor/grammars/TXL updated: c1c98dfa86...614cf83649

vendor/grammars/Terraform.tmLanguage

Vendored Submodule

+1

Submodule vendor/grammars/Terraform.tmLanguage added at 93b11ff8ab

vendor/grammars/language-meson

Vendored Submodule

+1

Submodule vendor/grammars/language-meson added at 017bf353f2

vendor/grammars/shaders-tmLanguage

Vendored Submodule

+1

Submodule vendor/grammars/shaders-tmLanguage added at cd1ef40f54