From 4c843574f7ae20d40e730ec35e7ead82c844ed6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=A9tan=20Lepage?=
 <33058747+GaetanLepage@users.noreply.github.com>
Date: Sat, 18 Feb 2023 10:59:45 +0100
Subject: [PATCH] plugins: solve previously merged conflict (#168)

---
 plugins/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/plugins/default.nix b/plugins/default.nix
index 4b5650f0..f665f29e 100644
--- a/plugins/default.nix
+++ b/plugins/default.nix
@@ -58,10 +58,7 @@
     ./utils/endwise.nix
     ./utils/floaterm.nix
     ./utils/goyo.nix
-    <<<<<<< HEAD
     ./utils/harpoon.nix
-    =======
-    >>>>>>> origin/main
     ./utils/indent-blankline.nix
     ./utils/intellitab.nix
     ./utils/mark-radar.nix