mirror of
https://github.com/NotAShelf/nvf.git
synced 2025-11-11 16:05:30 +00:00
plugins/git: add git-conflict-nvim; modularize
This commit is contained in:
parent
e49228d642
commit
585b8c9fc8
5 changed files with 76 additions and 0 deletions
|
|
@ -162,3 +162,7 @@
|
|||
[Mr-Helpful](https://github.com/Mr-Helpful)
|
||||
|
||||
- Corrects pin names used for nvim themes
|
||||
|
||||
[Libadoxon](https://github.com/Libadoxon)
|
||||
|
||||
- Add [git-conflict](https://github.com/akinsho/git-conflict.nvim) plugin for resolving git conflicts
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue