Resolve spec/models/ci/build_spec.rb

spec/models/ci/build_spec.rb

@@ -263,27 +263,6 @@ describe Ci::Build do
     context 'artifacts metadata does not exist' do
       before do
         build.update(legacy_artifacts_metadata: nil)
-<<<<<<< HEAD
-      end
-
-      it { is_expected.to be_falsy }
-    end
-
-    context 'artifacts metadata does exists' do
-      let(:build) { create(:ci_build, :artifacts) }
-
-      it { is_expected.to be_truthy }
-    end
-  end
-
-  describe '#browsable_artifacts?' do
-    subject { build.browsable_artifacts? }
-
-    context 'artifacts metadata does not exist' do
-      before do
-        build.update(legacy_artifacts_metadata: nil)
-=======
->>>>>>> upstream/master
       end
 
       it { is_expected.to be_falsy }