Resolve conflicts for locale/gitlab.pot

a870c481 · Filipa Lacerda · 5a418beb · a870c481
Commit a870c481 authored Aug 07, 2018 by Filipa Lacerda
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 16 deletions

locale/gitlab.pot locale/gitlab.pot +3 -16

No files found.
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -1202,23 +1202,7 @@ msgstr ""
 msgid "CICD|Continuous deployment to production"
 msgstr ""
-<<<<<<< HEAD
-msgid "CICD|Deployment strategy"
-msgstr ""
-msgid "CICD|Deployment strategy needs a domain name to work correctly."
-msgstr ""
-msgid "CICD|Disable Auto DevOps"
-msgstr ""
-msgid "CICD|Do not set up a domain here if you are setting up multiple Kubernetes clusters with Auto DevOps."
-msgstr ""
-msgid "CICD|Enable Auto DevOps"
-=======
 msgid "CICD|Default to Auto DevOps pipeline"
->>>>>>> upstream/master
 msgstr ""
 msgid "CICD|Deployment strategy"
@@ -1227,6 +1211,9 @@ msgstr ""
 msgid "CICD|Deployment strategy needs a domain name to work correctly."
 msgstr ""
+msgid "CICD|Do not set up a domain here if you are setting up multiple Kubernetes clusters with Auto DevOps."
+msgstr ""
 msgid "CICD|Jobs"
 msgstr ""