diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2022-08-06 18:05:00 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-08-06 18:05:00 +1000 |
| commit | 445a625b56a79be6cee7ec1ee35fe9f4fcc2daad (patch) | |
| tree | 1258e2bb1f5f486c109b9150e0805ded0d2fac90 /pkg/cheatsheet | |
| parent | cd2c01d1cfb0236ccb7c94a8aae21726ef1283d1 (diff) | |
rename merging context to mergeConflicts
Diffstat (limited to 'pkg/cheatsheet')
| -rw-r--r-- | pkg/cheatsheet/generate.go | 2 |
1 files changed, 1 insertions, 1 deletions
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, |