summaryrefslogtreecommitdiff
path: root/fnl/plugins/git-conflicts.fnl
diff options
context:
space:
mode:
Diffstat (limited to 'fnl/plugins/git-conflicts.fnl')
-rw-r--r--fnl/plugins/git-conflicts.fnl14
1 files changed, 0 insertions, 14 deletions
diff --git a/fnl/plugins/git-conflicts.fnl b/fnl/plugins/git-conflicts.fnl
deleted file mode 100644
index aff898a..0000000
--- a/fnl/plugins/git-conflicts.fnl
+++ /dev/null
@@ -1,14 +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
- :event :VeryLazy
- :version "*"
- :config true
- : keys}