mirror of
https://github.com/sharkdp/bat.git
synced 2026-10-28 08:05:55 +00:00
fixed merge conflicts
This commit is contained in:
commit
3e7ad18fe3
22 files changed
+196
-148
No files matched your search
Vendored
+1
-1
Submodule assets/syntaxes/02_Extra/Org_mode updated: 4976d8f84e...bb6e5d8481.
Vendored
+1
-1
Submodule assets/syntaxes/02_Extra/Zig updated: 1a4a38445f...8a4a3fe4a0.
+1
Submodule assets/syntaxes/02_Extra/sublime-odin added at 5d6a0ed41e.
Reference in new issue
Block a user