cleanup

markiv · Jan 7, 2020 · de2cfc7 · de2cfc7
1 parent e72cab8
commit de2cfc7
Showing 1 changed file with 0 additions and 7 deletions.
diff --git 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 {