Resolve conflicts in app/models/ci/build.rb

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

app/models/ci/build.rb

@@ -7,11 +7,8 @@ module Ci
     include Presentable
     include Importable
     include Gitlab::Utils::StrongMemoize
-<<<<<<< HEAD
 
     prepend EE::Ci::Build
-=======
->>>>>>> upstream/master
 
     MissingDependenciesError = Class.new(StandardError)
 
@@ -291,7 +288,6 @@ module Ci
         variables.concat(pipeline.pipeline_schedule.job_variables) if pipeline.pipeline_schedule
       end
     end
-<<<<<<< HEAD
 
     ##
     # Variables that do not depend on the environment name.
@@ -303,19 +299,6 @@ module Ci
     end
 
     ##
-=======
-
-    ##
-    # Variables that do not depend on the environment name.
-    #
-    def simple_variables
-      strong_memoize(:simple_variables) do
-        scoped_variables(environment: nil).to_runner_variables
-      end
-    end
-
-    ##
->>>>>>> upstream/master
     # All variables, including persisted environment variables.
     #
     def variables