diff options
| author | Christian Clason <c.clason@uni-graz.at> | 2023-08-15 11:52:00 +0200 |
|---|---|---|
| committer | Christian Clason <c.clason@uni-graz.at> | 2023-08-15 12:32:20 +0200 |
| commit | 7aad4643f9a6c2c3cc3033ae6dafef71036d3585 (patch) | |
| tree | e5403a2eaaaa017caff5a5afbe4598ccbf394f3c | |
| parent | 22d397c233b12a94ba36052d9e626ed61e25d488 (diff) | |
| download | rneovim-7aad4643f9a6c2c3cc3033ae6dafef71036d3585.tar.gz rneovim-7aad4643f9a6c2c3cc3033ae6dafef71036d3585.tar.bz2 rneovim-7aad4643f9a6c2c3cc3033ae6dafef71036d3585.zip | |
fix(deps): remove stray conflict marker
fixup for https://github.com/neovim/neovim/commit/22d397c233b12a94ba36052d9e626ed61e25d488
| -rw-r--r-- | cmake.deps/deps.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/cmake.deps/deps.txt b/cmake.deps/deps.txt index cae3dcd696..a772874d70 100644 --- a/cmake.deps/deps.txt +++ b/cmake.deps/deps.txt @@ -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 |