Resolve conflict in spec/models/ci/build_spec.rb

spec/models/ci/build_spec.rb

@@ -2358,13 +2358,8 @@ describe Ci::Build do
           allow_any_instance_of(Project)
             .to receive(:predefined_variables) { [project_pre_var] }
 
-<<<<<<< HEAD
           allow_any_instance_of(EE::Project)
-            .to receive(:secret_variables_for)
-=======
-          allow_any_instance_of(Project)
             .to receive(:ci_variables_for)
->>>>>>> upstream/master
             .with(ref: 'master', environment: nil) do
             [create(:ci_variable, key: 'secret', value: 'value')]
           end