From 5234ea22cb11eece78f69dd7a79a3086c90e898a Mon Sep 17 00:00:00 2001
From: Gustaf Rydholm <gustaf.rydholm@gmail.com>
Date: Thu, 23 Jan 2025 23:43:59 +0100
Subject: Remove git conflict

---
 fnl/plugins/git-conflict.fnl | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 fnl/plugins/git-conflict.fnl

(limited to 'fnl')

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}
-- 
cgit v1.2.3-70-g09d2