diff options
Diffstat (limited to 'fnl/plugins')
-rw-r--r-- | fnl/plugins/git-conflict.fnl | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/fnl/plugins/git-conflict.fnl b/fnl/plugins/git-conflict.fnl deleted file mode 100644 index df3285e..0000000 --- a/fnl/plugins/git-conflict.fnl +++ /dev/null @@ -1,13 +0,0 @@ -;; Resolve git conflicts. - -(local keys [{1 :<leader>gi - 2 :<cmd>GitConflictListQf<cr> - :desc "Git Conflict Quick Fix"} - {1 :<leader>gg - 2 :<cmd>GitConflictRefresh<cr> - :desc "Git Conflict Refresh"}]) - -{1 :akinsho/git-conflict.nvim - :version "*" - :config true - : keys} |