From 445a625b56a79be6cee7ec1ee35fe9f4fcc2daad Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sat, 6 Aug 2022 18:05:00 +1000 Subject: rename merging context to mergeConflicts --- pkg/cheatsheet/generate.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkg/cheatsheet') diff --git a/pkg/cheatsheet/generate.go b/pkg/cheatsheet/generate.go index d69a448fb..6d0007653 100644 --- a/pkg/cheatsheet/generate.go +++ b/pkg/cheatsheet/generate.go @@ -106,7 +106,7 @@ func localisedTitle(tr *i18n.TranslationSet, str string) string { "information": tr.InformationTitle, "main": tr.NormalTitle, "patchBuilding": tr.PatchBuildingTitle, - "merging": tr.MergingTitle, + "mergeConflicts": tr.MergingTitle, "staging": tr.StagingTitle, "menu": tr.MenuTitle, "search": tr.SearchTitle, -- cgit v1.2.3