Resolve conflicts in ci/config.rb

lib/gitlab/ci/config.rb

@@ -4,11 +4,8 @@ module Gitlab
     # Base GitLab CI Configuration facade
     #
     class Config
-<<<<<<< HEAD
       prepend EE::Gitlab::Ci::Config
 
-=======
->>>>>>> upstream/master
       ConfigError = Class.new(StandardError)
 
       def initialize(config, opts = {})
@@ -69,11 +66,8 @@ module Gitlab
         @global.jobs_value
       end
 
-<<<<<<< HEAD
       private
 
-=======
->>>>>>> upstream/master
       # 'opts' argument is used in EE see /ee/lib/ee/gitlab/ci/config.rb
       def build_config(config, opts = {})
         Loader.new(config).load!