From 90983aae65c1f71c3906f1161cf236d405ddcc11 Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Sat, 5 Jun 2021 13:35:24 +1000
Subject: [PATCH] not importing regexp

---
 pkg/gui/mergeconflicts/find_conflicts.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkg/gui/mergeconflicts/find_conflicts.go b/pkg/gui/mergeconflicts/find_conflicts.go
index 848c05756..e88415959 100644
--- a/pkg/gui/mergeconflicts/find_conflicts.go
+++ b/pkg/gui/mergeconflicts/find_conflicts.go
@@ -1,7 +1,6 @@
 package mergeconflicts
 
 import (
-	"regexp"
 	"strings"
 
 	"github.com/jesseduffield/lazygit/pkg/utils"