Resolve conflicts in pipeline build specs

e055543d · Grzegorz Bizon · ad30e6eb · e055543d
Commit e055543d authored Mar 14, 2018 by Grzegorz Bizon
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

spec/models/ci/build_spec.rb spec/models/ci/build_spec.rb +0 -4

No files found.
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
@@ -1917,11 +1917,7 @@ describe Ci::Build do
          allow_any_instance_of(Project)
            .to receive(:predefined_variables) { [project_pre_var] }

-<<<<<<< HEAD
          allow_any_instance_of(EE::Project)
-=======
-          allow_any_instance_of(Project)
->>>>>>> upstream/master
            .to receive(:secret_variables_for)
            .with(ref: 'master', environment: nil) do
            [create(:ci_variable, key: 'secret', value: 'value')]