Resolve merge conflicts

locale/gitlab.pot

@@ -775,12 +775,9 @@ msgstr ""
 msgid "Are you sure you want to stop this environment?"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Are you sure you want to unlock %{path_lock_path}?"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "Are you sure?"
 msgstr ""
 
@@ -2704,15 +2701,6 @@ msgid "DeployTokens|Your new project deploy token has been created."
 msgstr ""
 
 msgid "Deployed to"
-<<<<<<< HEAD
-=======
-msgstr ""
-
-msgid "Deploying to"
-msgstr ""
-
-msgid "Deprioritize label"
->>>>>>> upstream/master
 msgstr ""
 
 msgid "Deploying to"
@@ -7266,12 +7254,9 @@ msgstr ""
 msgid "Something went wrong while fetching comments. Please try again."
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Something went wrong while fetching group member contributions"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "Something went wrong while fetching the environments for this merge request. Please try again."
 msgstr ""
 
@@ -7467,12 +7452,9 @@ msgstr ""
 msgid "Start a %{new_merge_request} with these changes"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Start a review"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "Start and due date"
 msgstr ""
 
@@ -8880,11 +8862,10 @@ msgstr ""
 msgid "You can set up jobs to only use Runners with specific tags. Separate tags with commas."
 msgstr ""
 
-<<<<<<< HEAD
-msgid "You cannot write to a read-only secondary GitLab Geo instance. Please use %{link_to_primary_node} instead."
-=======
 msgid "You can test your .gitlab-ci.yml in %{linkStart}CI Lint%{linkEnd}."
->>>>>>> upstream/master
+msgstr ""
+
+msgid "You cannot write to a read-only secondary GitLab Geo instance. Please use %{link_to_primary_node} instead."
 msgstr ""
 
 msgid "You cannot write to this read-only GitLab instance."

spec/javascripts/vue_shared/components/sidebar/collapsed_grouped_date_picker_spec.js

@@ -77,11 +77,7 @@ describe('collapsedGroupedDatePicker', () => {
       expect(icons[0].innerText.trim()).toEqual('None');
     });
 
-<<<<<<< HEAD
-    it('should have tooltip as `Start and due dates`', () => {
-=======
     it('should have tooltip as `Start and due date`', () => {
->>>>>>> upstream/master
       const icons = vm.$el.querySelectorAll('.sidebar-collapsed-icon');
 
       expect(icons[0].dataset.originalTitle).toBe('Start and due date');