From cc8adce9d8a7dd63bc639b3e2d3e71d82ee1713f Mon Sep 17 00:00:00 2001
From: Gustaf Rydholm <gustaf.rydholm@gmail.com>
Date: Fri, 22 Sep 2023 23:58:52 +0200
Subject: Add git-conflicts

---
 fnl/plugins/editor/git-conflicts.fnl | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 fnl/plugins/editor/git-conflicts.fnl

(limited to 'fnl/plugins')

diff --git a/fnl/plugins/editor/git-conflicts.fnl b/fnl/plugins/editor/git-conflicts.fnl
new file mode 100644
index 0000000..4a4583b
--- /dev/null
+++ b/fnl/plugins/editor/git-conflicts.fnl
@@ -0,0 +1,3 @@
+;; Resolve git conflicts.
+
+{1 :akinsho/git-conflict.nvim :event :BufReadPre :tag "v1.0.0" :config true}
-- 
cgit v1.2.3-70-g09d2