From 04c2b6c07fdf711d983a9afd4d1ca5deb84d2102 Mon Sep 17 00:00:00 2001
From: Gustaf Rydholm <gustaf.rydholm@gmail.com>
Date: Sat, 11 May 2024 22:49:26 +0200
Subject: Rename git-conflict

---
 fnl/plugins/git-conflict.fnl  | 13 +++++++++++++
 fnl/plugins/git-conflicts.fnl | 14 --------------
 2 files changed, 13 insertions(+), 14 deletions(-)
 create mode 100644 fnl/plugins/git-conflict.fnl
 delete mode 100644 fnl/plugins/git-conflicts.fnl

(limited to 'fnl/plugins')

diff --git a/fnl/plugins/git-conflict.fnl b/fnl/plugins/git-conflict.fnl
new file mode 100644
index 0000000..df3285e
--- /dev/null
+++ b/fnl/plugins/git-conflict.fnl
@@ -0,0 +1,13 @@
+;; 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}
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}
-- 
cgit v1.2.3-70-g09d2