fix(deps): remove stray conflict marker

fixup for 22d397c233
This commit is contained in:
Christian Clason 2023-08-15 11:52:00 +02:00
parent 22d397c233
commit 7aad4643f9

View File

@ -48,7 +48,6 @@ TREESITTER_C_URL https://github.com/tree-sitter/tree-sitter-c/archive/v0.20.6.ta
TREESITTER_C_SHA256 44989072e1a9cd3d8f16e9cc3e726af50de6d3017f1231bdf3303b8cc007424e
TREESITTER_LUA_URL https://github.com/MunifTanjim/tree-sitter-lua/archive/v0.0.19.tar.gz
TREESITTER_LUA_SHA256 974230f212d0049fce8e881b88b18eebbd05f1fd0edd16fe4ba5bdd2bcd78d08
>>>>>>> d10db556f (build(deps): bump tree-sitter-lua to v0.0.19)
TREESITTER_VIM_URL https://github.com/neovim/tree-sitter-vim/archive/v0.3.0.tar.gz
TREESITTER_VIM_SHA256 403acec3efb7cdb18ff3d68640fc823502a4ffcdfbb71cec3f98aa786c21cbe2
TREESITTER_VIMDOC_URL https://github.com/neovim/tree-sitter-vimdoc/archive/v2.0.1.tar.gz