Fix conflicts on ci normalizer

Fix conflict for ce-to-ee-2018-11-07

lib/gitlab/ci/config/normalizer.rb

@@ -9,24 +9,16 @@ module Gitlab
         end
 
         def normalize_jobs
-<<<<<<< HEAD
-          extract_parallelized_jobs
-=======
           extract_parallelized_jobs!
           return @jobs_config if @parallelized_jobs.empty?
 
->>>>>>> upstream/master
           parallelized_config = parallelize_jobs
           parallelize_dependencies(parallelized_config)
         end
 
         private
 
-<<<<<<< HEAD
-        def extract_parallelized_jobs
-=======
         def extract_parallelized_jobs!
->>>>>>> upstream/master
           @parallelized_jobs = {}
 
           @jobs_config.each do |job_name, config|
@@ -51,13 +43,8 @@ module Gitlab
         end
 
         def parallelize_dependencies(parallelized_config)
-<<<<<<< HEAD
-          parallelized_config.each_with_object({}) do |(job_name, config), hash|
-            parallelized_job_names = @parallelized_jobs.keys.map(&:to_s)
-=======
           parallelized_job_names = @parallelized_jobs.keys.map(&:to_s)
           parallelized_config.each_with_object({}) do |(job_name, config), hash|
->>>>>>> upstream/master
             if config[:dependencies] && (intersection = config[:dependencies] & parallelized_job_names).any?
               deps = intersection.map { |dep| @parallelized_jobs[dep.to_sym].map(&:first) }.flatten
               hash[job_name] = config.merge(dependencies: deps)