Resolve conflicts in app/models/merge_request.rb

app/models/merge_request.rb

@@ -412,7 +412,6 @@ class MergeRequest < ActiveRecord::Base
     return true unless source_project
 
     !source_project.in_fork_network_of?(target_project)
-<<<<<<< HEAD
   end
 
   def validate_approvals_before_merge
@@ -429,8 +428,6 @@ class MergeRequest < ActiveRecord::Base
       errors.add :validate_approvals_before_merge,
                  'Number of approvals must be greater than those on target project'
     end
-=======
->>>>>>> ce-com/master
   end
 
   def reopenable?