fix conflict in spec/requests/api/resource_label_events_spec.rb

spec/requests/api/resource_label_events_spec.rb

@@ -63,7 +63,6 @@ describe API::ResourceLabelEvents do
     end
   end
 
-<<<<<<< HEAD
   context 'when eventable is an Epic' do
     let(:group) { create(:group, :public) }
     let(:epic) { create(:epic, group: group, author: user) }
@@ -80,8 +79,6 @@ describe API::ResourceLabelEvents do
     end
   end
 
-=======
->>>>>>> upstream/master
   context 'when eventable is a Merge Request' do
     let(:merge_request) { create(:merge_request, source_project: project, target_project: project, author: user) }