mirror of
https://github.com/sharkdp/bat.git
synced 2026-10-30 10:06:12 +00:00
fixed merge conflicts
This commit is contained in:
commit
3e7ad18fe3
22 files changed
+196
-148
No files matched your search
@@ -269,3 +269,6 @@
|
||||
[submodule "assets/syntaxes/02_Extra/GDScript-sublime"]
|
||||
path = assets/syntaxes/02_Extra/GDScript-sublime
|
||||
url = https://github.com/beefsack/GDScript-sublime
|
||||
[submodule "assets/syntaxes/02_Extra/sublime-odin"]
|
||||
path = assets/syntaxes/02_Extra/sublime-odin
|
||||
url = https://github.com/odin-lang/sublime-odin
|
||||
Reference in new issue
Block a user