From 43ab7318d37e049cf3ae406fed8823c5c7f577a3 Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Mon, 18 Feb 2019 19:28:02 +1100
Subject: [PATCH] remove HasMergeConflicts struct instance variables

---
 pkg/gui/gui.go | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go
index 5b62236af..f001a8113 100644
--- a/pkg/gui/gui.go
+++ b/pkg/gui/gui.go
@@ -124,17 +124,16 @@ type panelStates struct {
 }
 
 type guiState struct {
-	Files             []*commands.File
-	Branches          []*commands.Branch
-	Commits           []*commands.Commit
-	StashEntries      []*commands.StashEntry
-	PreviousView      string
-	HasMergeConflicts bool
-	Platform          commands.Platform
-	Updating          bool
-	Panels            *panelStates
-	WorkingTreeState  string // one of "merging", "rebasing", "normal"
-	Contexts          map[string]string
+	Files            []*commands.File
+	Branches         []*commands.Branch
+	Commits          []*commands.Commit
+	StashEntries     []*commands.StashEntry
+	PreviousView     string
+	Platform         commands.Platform
+	Updating         bool
+	Panels           *panelStates
+	WorkingTreeState string // one of "merging", "rebasing", "normal"
+	Contexts         map[string]string
 }
 
 // NewGui builds a new gui handler