From f404e6f97d102ce40578da9089a1ee4c226e3cf0 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 14 Feb 2023 23:15:18 +0100
Subject: [PATCH] plugins: solve previously merged conflict

---
 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