diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua index 30f8ff3..6c63f07 100644 --- a/nvim/.config/nvim/lua/plugins.lua +++ b/nvim/.config/nvim/lua/plugins.lua @@ -43,7 +43,6 @@ local init = function () } use 'tpope/vim-fugitive' use 'rhysd/git-messenger.vim' - use 'rhysd/conflict-marker.vim' use 'salcode/vim-interactive-rebase-reverse' use 'whiteinge/diffconflicts' use 'sindrets/diffview.nvim'