Resolve spec/lib/gitlab/ci/config_spec.rb

123f0ccc · Robert Speicher · 6fa3ef87 · 123f0ccc
Commit 123f0ccc authored Sep 13, 2018 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

spec/lib/gitlab/ci/config_spec.rb spec/lib/gitlab/ci/config_spec.rb +0 -3

No files found.
--- a/spec/lib/gitlab/ci/config_spec.rb
+++ b/spec/lib/gitlab/ci/config_spec.rb
@@ -357,7 +357,6 @@ describe Gitlab::Ci::Config do
      end
    end
  end
-<<<<<<< HEAD

  context "when using 'include' directive" do
    let(:project) { create(:project, :repository) }
@@ -824,6 +823,4 @@ describe Gitlab::Ci::Config do
      end
    end
  end
-=======
->>>>>>> upstream/master
 end