From de2cfc7e176c210c593e654d2aa857624507a9a0 Mon Sep 17 00:00:00 2001 From: David Chen Date: Tue, 7 Jan 2020 12:48:11 -0800 Subject: cleanup --- pkg/gui/merge_panel.go | 7 ------- 1 file changed, 7 deletions(-) (limited to 'pkg') diff --git a/pkg/gui/merge_panel.go b/pkg/gui/merge_panel.go index 2084ee4f1..25238ce4f 100644 --- a/pkg/gui/merge_panel.go +++ b/pkg/gui/merge_panel.go @@ -250,13 +250,6 @@ func (gui *Gui) renderMergeOptions() error { gui.getKeyDisplay("main.pickBothHunks"): gui.Tr.SLocalize("pickBothHunks"), gui.getKeyDisplay("main.undo"): gui.Tr.SLocalize("undo"), }) - return gui.renderOptionsMap(map[string]string{ - "↑ ↓": gui.Tr.SLocalize("selectHunk"), - "← →": gui.Tr.SLocalize("navigateConflicts"), - "space": gui.Tr.SLocalize("pickHunk"), - "b": gui.Tr.SLocalize("pickBothHunks"), - "z": gui.Tr.SLocalize("undo"), - }) } func (gui *Gui) handleEscapeMerge(g *gocui.Gui, v *gocui.View) error { -- cgit v1.2.3