summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2021-06-05 13:35:24 +1000
committerJesse Duffield <jessedduffield@gmail.com>2021-06-05 13:53:25 +1000
commit90983aae65c1f71c3906f1161cf236d405ddcc11 (patch)
treec9dceb9e4cab6ad8b605001e43e9eef0a2bcc7e7
parentf71b23b890014ce7eff01fd72ac50c672ed07ae9 (diff)
not importing regexp
-rw-r--r--pkg/gui/mergeconflicts/find_conflicts.go1
1 files changed, 0 insertions, 1 deletions
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"