Resolve conflicts

app/assets/javascripts/dispatcher.js

@@ -33,12 +33,9 @@
 /* global Labels */
 /* global Shortcuts */
 /* global Sidebar */
-<<<<<<< HEAD
 /* global WeightSelect */
 /* global AdminEmailSelect */
-=======
 /* global ShortcutsWiki */
->>>>>>> aecaaa67c3d84637e6c691ed07b44115330dddcb
 
 import Issue from './issue';
 

config/routes/project.rb

@@ -119,13 +119,6 @@ constraints(ProjectUrlConstrainer.new) do
         end
       end
 
-<<<<<<< HEAD
-      resources :branches, only: [:index, :new, :create, :destroy], constraints: { id: Gitlab::Regex.git_reference_regex }
-      delete :merged_branches, controller: 'branches', action: :destroy_all_merged
-      resources :tags, only: [:index, :show, :new, :create, :destroy], constraints: { id: Gitlab::Regex.git_reference_regex } do
-        resource :release, only: [:edit, :update]
-      end
-
       ## EE-specific
       resources :path_locks, only: [:index, :destroy] do
         collection do
@@ -137,18 +130,6 @@ constraints(ProjectUrlConstrainer.new) do
       get '/service_desk' => 'service_desk#show', as: :service_desk
       put '/service_desk' => 'service_desk#update', as: :service_desk_refresh
 
-      resources :protected_branches, only: [:index, :show, :create, :update, :destroy, :patch], constraints: { id: Gitlab::Regex.git_reference_regex } do
-        ## EE-specific
-        scope module: :protected_branches do
-          resources :merge_access_levels, only: [:destroy]
-          resources :push_access_levels, only: [:destroy]
-        end
-      end
-
-      resources :protected_tags, only: [:index, :show, :create, :update, :destroy], constraints: { id: Gitlab::Regex.git_reference_regex }
-
-=======
->>>>>>> aecaaa67c3d84637e6c691ed07b44115330dddcb
       resources :variables, only: [:index, :show, :update, :create, :destroy]
       resources :triggers, only: [:index, :create, :edit, :update, :destroy] do
         member do

config/routes/repository.rb

@@ -52,7 +52,14 @@ scope format: false do
       resource :release, only: [:edit, :update]
     end
 
-    resources :protected_branches, only: [:index, :show, :create, :update, :destroy]
+    resources :protected_branches, only: [:index, :show, :create, :update, :destroy, :patch], constraints: { id: Gitlab::Regex.git_reference_regex } do
+      ## EE-specific
+      scope module: :protected_branches do
+        resources :merge_access_levels, only: [:destroy]
+        resources :push_access_levels, only: [:destroy]
+      end
+    end
+
     resources :protected_tags, only: [:index, :show, :create, :update, :destroy]
   end
 

config/webpack.config.js

@@ -128,11 +128,8 @@ var config = {
         'notebook_viewer',
         'pdf_viewer',
         'vue_pipelines',
-<<<<<<< HEAD
         'mr_widget_ee',
-=======
-        'issue_show',
->>>>>>> aecaaa67c3d84637e6c691ed07b44115330dddcb
+        'issue_show'
       ],
       minChunks: function(module, count) {
         return module.resource && (/vue_shared/).test(module.resource);

features/steps/project/project.rb

@@ -67,7 +67,6 @@ class Spinach::Features::Project < Spinach::FeatureSteps
     expect(page).not_to have_link('Remove avatar')
   end
 
-<<<<<<< HEAD
   step 'I fill in merge request template' do
     fill_in 'project_merge_requests_template', with: "This merge request should contain the following."
   end
@@ -90,14 +89,6 @@ class Spinach::Features::Project < Spinach::FeatureSteps
     end
   end
 
-  step 'I should see project "Shop" version' do
-    page.within '.project-side' do
-      expect(page).to have_content '6.7.0.pre'
-    end
-  end
-
-=======
->>>>>>> aecaaa67c3d84637e6c691ed07b44115330dddcb
   step 'change project default branch' do
     select 'fix', from: 'project_default_branch'
     click_button 'Save changes'