summaryrefslogtreecommitdiffstats
path: root/pkg/i18n/english.go
diff options
context:
space:
mode:
Diffstat (limited to 'pkg/i18n/english.go')
-rw-r--r--pkg/i18n/english.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go
index b15f60bbb..ee53cc1b9 100644
--- a/pkg/i18n/english.go
+++ b/pkg/i18n/english.go
@@ -148,6 +148,9 @@ func addEnglish(i18nObject *i18n.Bundle) error {
ID: "resolveMergeConflicts",
Other: "resolve merge conflicts",
}, &i18n.Message{
+ ID: "MergeConflictsTitle",
+ Other: "Merge Conflicts",
+ }, &i18n.Message{
ID: "checkout",
Other: "checkout",
}, &i18n.Message{