Regenerate locale/gitlab.pot

locale/gitlab.pot

@@ -8283,7 +8283,9 @@ msgstr ""
 msgid "Track time with quick actions"
 msgstr ""
 
-<<<<<<< HEAD
+msgid "Tree view"
+msgstr ""
+
 msgid "Trending"
 msgstr ""
 
@@ -8291,12 +8293,6 @@ msgid "Trigger"
 msgstr ""
 
 msgid "Trigger pipelines for mirror updates"
-=======
-msgid "Tree view"
-msgstr ""
-
-msgid "Trending"
->>>>>>> upstream/master
 msgstr ""
 
 msgid "Trigger pipelines when branches or tags are updated from the upstream repository. Depending on the activity of the upstream repository, this may greatly increase the load on your CI runners. Only enable this if you know they can handle the load."