diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-29 19:09:20 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-03-17 19:13:40 +1100 |
| commit | 138be04e6575f2bd087630e49d122af578c78bf6 (patch) | |
| tree | ed038641d6871e49ff426096f300e6b3b3ab4f1e /pkg/gui/files_panel.go | |
| parent | 1a74ed32143f826104e1d60f4392d2d8ba53cd80 (diff) | |
refactor contexts code
Diffstat (limited to 'pkg/gui/files_panel.go')
| -rw-r--r-- | pkg/gui/files_panel.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go index 9c0fbd24e..4e2e062bd 100644 --- a/pkg/gui/files_panel.go +++ b/pkg/gui/files_panel.go @@ -7,7 +7,6 @@ import ( "github.com/jesseduffield/lazygit/pkg/commands/types/enums" "github.com/jesseduffield/lazygit/pkg/gui/filetree" "github.com/jesseduffield/lazygit/pkg/gui/mergeconflicts" - "github.com/jesseduffield/lazygit/pkg/gui/popup" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/utils" ) @@ -252,7 +251,7 @@ func (gui *Gui) refreshStateFiles() error { func (gui *Gui) promptToContinueRebase() error { gui.takeOverMergeConflictScrolling() - return gui.PopupHandler.Ask(popup.AskOpts{ + return gui.PopupHandler.Ask(types.AskOpts{ Title: "continue", Prompt: gui.Tr.ConflictsResolved, HandleConfirm: func() error { |