mirror of
https://github.com/NotAShelf/nvf.git
synced 2025-11-12 16:35:30 +00:00
Merge branch 'main' into feature/plugin-leetcode
This commit is contained in:
commit
914e2795ea
11 changed files with 88 additions and 7 deletions
|
|
@ -166,3 +166,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