Resolve conflicts in locale/gitlab.pot

Regenerated via `bundle exec rake gettext:regenerate`

locale/gitlab.pot

@@ -2226,11 +2226,10 @@ msgstr ""
 msgid "Cron syntax"
 msgstr ""
 
-<<<<<<< HEAD
-msgid "Current node"
-=======
 msgid "Current Branch"
->>>>>>> upstream/master
+msgstr ""
+
+msgid "Current node"
 msgstr ""
 
 msgid "CurrentUser|Profile"
@@ -3658,16 +3657,9 @@ msgstr ""
 msgid "IDE|Get started with Live Preview"
 msgstr ""
 
-<<<<<<< HEAD
-msgid "IDE|Go back"
-=======
 msgid "IDE|Go to project"
 msgstr ""
 
-msgid "IDE|Live Preview"
->>>>>>> upstream/master
-msgstr ""
-
 msgid "IDE|Live Preview"
 msgstr ""
 
@@ -4092,12 +4084,9 @@ msgstr ""
 msgid "Live preview"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Loading contribution stats for group members"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "Loading the GitLab IDE..."
 msgstr ""
 
@@ -7443,15 +7432,9 @@ msgstr ""
 msgid "You cannot write to this read-only GitLab instance."
 msgstr ""
 
-<<<<<<< HEAD
-msgid "You do not have any assigned merge requests"
-msgstr ""
-
 msgid "You do not have the correct permissions to override the settings from the LDAP group sync."
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "You don't have any applications"
 msgstr ""