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-03-08 09:20+0100\n"
-"PO-Revision-Date: 2018-03-08 09:20+0100\n"
-=======
-"POT-Creation-Date: 2018-03-12 19:50+0100\n"
-"PO-Revision-Date: 2018-03-12 19:50+0100\n"
->>>>>>> upstream/master
+"POT-Creation-Date: 2018-03-13 20:43+0100\n"
+"PO-Revision-Date: 2018-03-13 20:43+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -1401,14 +1396,13 @@ msgstr ""
 msgid "Create empty bare repository"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Create epic"
 msgstr ""
 
 msgid "Create file"
-=======
+msgstr ""
+
 msgid "Create group label"
->>>>>>> upstream/master
 msgstr ""
 
 msgid "Create lists from labels. Issues with that label appear in that list."
@@ -2402,11 +2396,10 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Make everyone on your team more productive regardless of their location. GitLab Geo creates read-only mirrors of your GitLab instance so you can reduce the time it takes to clone and fetch large repos."
-=======
+msgstr ""
+
 msgid "Manage group labels"
->>>>>>> upstream/master
 msgstr ""
 
 msgid "Manage labels"
@@ -3188,15 +3181,12 @@ msgstr ""
 msgid "PrometheusService|Common metrics"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "PrometheusService|Common metrics are automatically monitored based on a library of metrics from popular exporters."
 msgstr ""
 
 msgid "PrometheusService|Custom metrics"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "PrometheusService|Finding and configuring metrics..."
 msgstr ""
 
@@ -3221,12 +3211,9 @@ msgstr ""
 msgid "PrometheusService|More information"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "PrometheusService|New metric"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "PrometheusService|Prometheus API Base URL, like http://prometheus.example.com/"
 msgstr ""
 
@@ -3266,12 +3253,9 @@ msgstr ""
 msgid "Public - The project can be accessed without any authentication."
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Push Rules"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "Push events"
 msgstr ""
 
@@ -4212,18 +4196,15 @@ msgstr ""
 msgid "Trigger this manual action"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Turn on Service Desk"
 msgstr ""
 
-msgid "Unable to reset project cache."
+msgid "Unable to load the diff."
 msgstr ""
 
 msgid "Unknown"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "Unlock"
 msgstr ""