summary refs log tree commit diff
path: root/pkgs/misc/vim-plugins/vim-plugin-names
diff options
context:
space:
mode:
authorRonan Mac Fhlannchadha <ronan@arista.com>2021-05-21 20:47:15 +0100
committerRonan Mac Fhlannchadha <ronan@arista.com>2021-05-22 13:25:22 +0100
commit1941e7c9968d013464eae80256a75377a67885f7 (patch)
tree16868eab815c95e30603348aee320b0253f2fbda /pkgs/misc/vim-plugins/vim-plugin-names
parentfdaf66b6f0198bd91b7ec014665f7975446ec681 (diff)
downloadnixpkgs-1941e7c9968d013464eae80256a75377a67885f7.tar
nixpkgs-1941e7c9968d013464eae80256a75377a67885f7.tar.gz
nixpkgs-1941e7c9968d013464eae80256a75377a67885f7.tar.bz2
nixpkgs-1941e7c9968d013464eae80256a75377a67885f7.tar.lz
nixpkgs-1941e7c9968d013464eae80256a75377a67885f7.tar.xz
nixpkgs-1941e7c9968d013464eae80256a75377a67885f7.tar.zst
nixpkgs-1941e7c9968d013464eae80256a75377a67885f7.zip
vimPlugins.conflict-marker-vim: init at 2020-09-23
Diffstat (limited to 'pkgs/misc/vim-plugins/vim-plugin-names')
-rw-r--r--pkgs/misc/vim-plugins/vim-plugin-names1
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index db8c1518fca..731982b8cfb 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -532,6 +532,7 @@ rbgrouleff/bclose.vim
 rbong/vim-flog
 rcarriga/nvim-dap-ui
 rhysd/committia.vim
+rhysd/conflict-marker.vim
 rhysd/devdocs.vim
 rhysd/git-messenger.vim
 rhysd/vim-clang-format