From 023fbd2801d6e4828f6b1a790a25965b1297d3a5 Mon Sep 17 00:00:00 2001
From: LightQuantum <self@lightquantum.me>
Date: Fri, 17 Feb 2023 00:12:14 +0800
Subject: [PATCH] plugins: resolve 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