diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-15 13:29:28 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-15 14:15:41 +1100 |
| commit | 8d8bdb948b089250c22f3ac4f549152a209dcdb2 (patch) | |
| tree | 3687ba082abe7322fe5c77c452b618c7b5e6e2e2 /pkg/i18n/english.go | |
| parent | cdcfeb396fda1e61dee9b6d88ab4659152a10948 (diff) | |
avoid deadlock in merge panel
Diffstat (limited to 'pkg/i18n/english.go')
| -rw-r--r-- | pkg/i18n/english.go | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 2defb4ae6..4ff6c3555 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -58,7 +58,6 @@ type TranslationSet struct { PullWait string PushWait string FetchWait string - FileNoMergeCons string LcSoftReset string AlreadyCheckedOutBranch string SureForceCheckout string @@ -608,7 +607,6 @@ func EnglishTranslationSet() TranslationSet { PullWait: "Pulling...", PushWait: "Pushing...", FetchWait: "Fetching...", - FileNoMergeCons: "This file has no inline merge conflicts", LcSoftReset: "soft reset", AlreadyCheckedOutBranch: "You have already checked out this branch", SureForceCheckout: "Are you sure you want force checkout? You will lose all local changes", |