merge conflicts adjusted |
||
|---|---|---|
| .. | ||
| harpoon.lua | ||
| init.lua | ||
| neogit.lua | ||
| oil.lua | ||
| undotree.lua | ||
| vim-test.lua | ||
| vim-tmux.lua | ||
| vim_cmake.lua | ||
merge conflicts adjusted |
||
|---|---|---|
| .. | ||
| harpoon.lua | ||
| init.lua | ||
| neogit.lua | ||
| oil.lua | ||
| undotree.lua | ||
| vim-test.lua | ||
| vim-tmux.lua | ||
| vim_cmake.lua | ||