Resolve conflicts in quick_actions/interpret_service_spec.rb

spec/services/quick_actions/interpret_service_spec.rb

@@ -817,7 +817,6 @@ describe QuickActions::InterpretService do
       let(:issuable) { issue }
     end
 
-<<<<<<< HEAD
     context 'issuable weights licensed' do
       before do
         stub_licensed_features(issue_weights: true)
@@ -852,8 +851,6 @@ describe QuickActions::InterpretService do
       end
     end
 
-=======
->>>>>>> upstream/master
     context '/copy_metadata command' do
       let(:todo_label) { create(:label, project: project, title: 'To Do') }
       let(:inreview_label) { create(:label, project: project, title: 'In Review') }