Resolve spec/services/quick_actions/interpret_service_spec.rb

spec/services/quick_actions/interpret_service_spec.rb

@@ -1602,7 +1602,6 @@ describe QuickActions::InterpretService do
         end
       end
     end
-<<<<<<< HEAD
 
     # EE-specific tests
 
@@ -1614,17 +1613,5 @@ describe QuickActions::InterpretService do
         expect(explanations).to eq(['Sets weight to 4.'])
       end
     end
-
-    describe 'move issue to another project command' do
-      let(:content) { '/move test/project' }
-
-      it 'includes the project name' do
-        _, explanations = service.explain(content, issue)
-
-        expect(explanations).to eq(["Moves this issue to test/project."])
-      end
-    end
-=======
->>>>>>> upstream/master
   end
 end