diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2019-02-18 19:28:02 +1100 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-02-18 19:28:02 +1100 |
commit | 43ab7318d37e049cf3ae406fed8823c5c7f577a3 (patch) | |
tree | ba4c205b8b33114bf9ba3ffdd7cf6d95663e53d7 /pkg/gui | |
parent | cb372d469fd5d50fff919f49c2fd539dfb874ee8 (diff) |
remove HasMergeConflicts struct instance variables
Diffstat (limited to 'pkg/gui')
-rw-r--r-- | pkg/gui/gui.go | 21 |
1 files 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 |