Resolve conflicts

app/models/concerns/issuable.rb

@@ -121,11 +121,8 @@ module Issuable
     end
 
     def milestone_available?
-<<<<<<< HEAD
-=======
       return if is_a?(Epic)
 
->>>>>>> dev/master
       project_id == milestone&.project_id || project.ancestors_upto.compact.include?(milestone&.group)
     end
 

app/models/concerns/milestoneish.rb

@@ -46,7 +46,6 @@ module Milestoneish
     end
   end
 
-<<<<<<< HEAD
   def merge_requests_visible_to_user(user)
     memoize_per_user(user, :merge_requests_visible_to_user) do
       MergeRequestsFinder.new(user, {})
@@ -54,8 +53,6 @@ module Milestoneish
     end
   end
 
-=======
->>>>>>> dev/master
   def issue_participants_visible_by_user(user)
     User.joins(:issue_assignees)
       .where('issue_assignees.issue_id' => issues_visible_to_user(user).select(:id))

app/policies/group_policy.rb

@@ -53,10 +53,7 @@ class GroupPolicy < BasePolicy
   rule { admin }.enable :read_group
 
   rule { has_projects }.policy do
-<<<<<<< HEAD
     enable :read_list
-=======
->>>>>>> dev/master
     enable :read_label
   end
 

ee/spec/models/burndown_spec.rb

@@ -142,11 +142,7 @@ describe Burndown do
 
     context 'when nested group milestone', :nested_groups do
       before do
-<<<<<<< HEAD
-        group.add_developer(user)
-=======
         parent_group.add_developer(user)
->>>>>>> dev/master
       end
 
       it_behaves_like 'burndown for milestone' do

spec/policies/group_policy_spec.rb

@@ -115,21 +115,13 @@ describe GroupPolicy do
       project.add_developer(current_user)
     end
 
-<<<<<<< HEAD
     it { expect_allowed(:read_label, :read_list) }
-=======
-    it { expect_allowed(:read_label) }
->>>>>>> dev/master
 
     context 'in subgroups', :nested_groups do
       let(:subgroup) { create(:group, :private, parent: group) }
       let(:project) { create(:project, namespace: subgroup) }
 
-<<<<<<< HEAD
       it { expect_allowed(:read_label, :read_list) }
-=======
-      it { expect_allowed(:read_label) }
->>>>>>> dev/master
     end
   end