Resolve conflicts in spec/fixtures/api/schemas/entities/merge_request_widget.json

lib/api/v3/merge_requests.rb

@@ -167,11 +167,7 @@ module API
                                    desc: 'Status of the merge request'
             use :optional_params
             at_least_one_of :title, :target_branch, :description, :assignee_id,
-<<<<<<< HEAD
                             :milestone_id, :labels, :state_event, :approvals_before_merge,
-=======
-                            :milestone_id, :labels, :state_event,
->>>>>>> upstream/master
                             :remove_source_branch, :squash
           end
           put path do