fixed merge conflicts

Browse Source

...

This commit is contained in:

chetanjangir0

2025-04-12 17:22:18 +05:30

parent 3d4c72da0b 80a38590b8

commit 3e7ad18fe3

22 changed files with 196 additions and 148 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

2

assets/syntaxes/02_Extra/Org_mode vendored

Submodule assets/syntaxes/02_Extra/Org_mode updated: 4976d8f84e...bb6e5d8481

2

assets/syntaxes/02_Extra/Zig vendored

Submodule assets/syntaxes/02_Extra/Zig updated: 1a4a38445f...8a4a3fe4a0

1

assets/syntaxes/02_Extra/sublime-odin vendored Submodule

Submodule assets/syntaxes/02_Extra/sublime-odin added at 5d6a0ed41e