From db1ebe9aa5419a7552638ecd1a5460c8077de519 Mon Sep 17 00:00:00 2001
From: Buliway <me@buliway.ru>
Date: Wed, 8 Jan 2025 21:59:57 +0300
Subject: [PATCH] delete git-conflict.nvim

---
 nvim/lua/custom/plugins/git.lua | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/nvim/lua/custom/plugins/git.lua b/nvim/lua/custom/plugins/git.lua
index fac5cc2..238bd5e 100644
--- a/nvim/lua/custom/plugins/git.lua
+++ b/nvim/lua/custom/plugins/git.lua
@@ -1,20 +1,4 @@
 return {
-    -- {
-    --     'akinsho/git-conflict.nvim',
-    --     version = '*',
-    --     config = function()
-    --         require('git-conflict').setup {
-    --             default_mappings = false, -- disable buffer local mapping created by this plugin
-    --             default_commands = true, -- disable commands created by this plugin
-    --             disable_diagnostics = false, -- This will disable the diagnostics in a buffer whilst it is conflicted
-    --             list_opener = 'copen', -- command or function to open the conflicts list
-    --             highlights = { -- They must have background color, otherwise the default color will be used
-    --                 incoming = 'DiffAdd',
-    --                 current = 'DiffText',
-    --             },
-    --         }
-    --     end,
-    -- },
     {
         'sindrets/diffview.nvim',
     },