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 /runtime/lua/vim/_meta/vimfn.lua | |
| 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
Diffstat (limited to 'runtime/lua/vim/_meta/vimfn.lua')
0 files changed, 0 insertions, 0 deletions