Resolve conflicts in locale/gitlab.pot

locale/gitlab.pot

@@ -8,13 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gitlab 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
 "POT-Creation-Date: 2018-06-08 18:27+0200\n"
 "PO-Revision-Date: 2018-06-08 18:27+0200\n"
-=======
-"POT-Creation-Date: 2018-06-08 18:19+0200\n"
-"PO-Revision-Date: 2018-06-08 18:19+0200\n"
->>>>>>> upstream/master
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -960,12 +955,9 @@ msgstr ""
 msgid "CI/CD for external repo"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "CI/CD settings"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "CICD|An explicit %{ci_file} needs to be specified before you can begin using Continuous Integration and Delivery."
 msgstr ""
 
@@ -3055,7 +3047,6 @@ msgstr ""
 msgid "Import repository"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "ImportButtons|Connect repositories from"
 msgstr ""
 
@@ -3068,8 +3059,6 @@ msgstr ""
 msgid "Improve search with Advanced Global Search and GitLab Enterprise Edition."
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "Include a Terms of Service agreement and Privacy Policy that all users must accept."
 msgstr ""
 
@@ -5132,7 +5121,6 @@ msgid "Team"
 msgstr ""
 
 msgid "Terms of Service Agreement and Privacy Policy"
-<<<<<<< HEAD
 msgstr ""
 
 msgid "Terms of Service and Privacy Policy"
@@ -5142,11 +5130,9 @@ msgid "Thanks! Don't show me this again"
 msgstr ""
 
 msgid "The Advanced Global Search in GitLab is a powerful search service that saves you time. Instead of creating duplicate code and wasting time, you can now search for code within other teams that can help your own project."
-=======
 msgstr ""
 
 msgid "Terms of Service and Privacy Policy"
->>>>>>> upstream/master
 msgstr ""
 
 msgid "The Issue Tracker is the place to add things that need to be improved or solved in a project"