mirror of
https://github.com/sharkdp/bat.git
synced 2025-09-02 03:12:25 +01:00
fixed merge conflicts
This commit is contained in:
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -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