Fix conflict in ci config entry

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

lib/gitlab/ci/config/entry/job.rb

@@ -26,12 +26,6 @@ module Gitlab
             with_options allow_nil: true do
               validates :tags, array_of_strings: true
               validates :allow_failure, boolean: true
-<<<<<<< HEAD
-              validates :retry, numericality: { only_integer: true,
-                                                greater_than_or_equal_to: 0,
-                                                less_than_or_equal_to: 2 }
-=======
->>>>>>> upstream/master
               validates :parallel, numericality: { only_integer: true,
                                                    greater_than_or_equal_to: 2 }
               validates :when,
@@ -87,12 +81,9 @@ module Gitlab
 
           entry :coverage, Entry::Coverage,
             description: 'Coverage configuration for this job.'
-<<<<<<< HEAD
-=======
 
           entry :retry, Entry::Retry,
                description: 'Retry configuration for this job.'
->>>>>>> upstream/master
 
           helpers :before_script, :script, :stage, :type, :after_script,
                   :cache, :image, :services, :only, :except, :variables,
@@ -168,11 +159,7 @@ module Gitlab
               environment: environment_defined? ? environment_value : nil,
               environment_name: environment_defined? ? environment_value[:name] : nil,
               coverage: coverage_defined? ? coverage_value : nil,
-<<<<<<< HEAD
-              retry: retry_defined? ? retry_value.to_i : nil,
-=======
               retry: retry_defined? ? retry_value : nil,
->>>>>>> upstream/master
               parallel: parallel_defined? ? parallel_value.to_i : nil,
               artifacts: artifacts_value,
               after_script: after_script_value,