Resolve conflicts ci/build.rb, api/entities.rb

app/models/ci/build.rb

@@ -4,10 +4,7 @@ module Ci
     include AfterCommitQueue
     include Presentable
     include Importable
-<<<<<<< HEAD
     prepend EE::Build
-=======
->>>>>>> ce-com/master
 
     belongs_to :runner
     belongs_to :trigger_request
@@ -42,10 +39,7 @@ module Ci
     scope :with_expired_artifacts, ->() { with_artifacts.where('artifacts_expire_at < ?', Time.now) }
     scope :last_month, ->() { where('created_at > ?', Date.today - 1.month) }
     scope :manual_actions, ->() { where(when: :manual, status: COMPLETED_STATUSES + [:manual]) }
-<<<<<<< HEAD
     scope :codequality, ->() { where(name: %w[codequality codeclimate]) }
-=======
->>>>>>> ce-com/master
     scope :ref_protected, -> { where(protected: true) }
 
     mount_uploader :artifacts_file, ArtifactUploader

lib/api/entities.rb

@@ -914,8 +914,7 @@ module API
 
     class Variable < Grape::Entity
       expose :key, :value
-<<<<<<< HEAD
-      expose :protected?, as: :protected
+      expose :protected?, as: :protected, if: -> (entity, _) { entity.respond_to?(:protected?) }
 
       # EE
       expose :environment_scope, if: ->(variable, options) {
@@ -923,9 +922,6 @@ module API
           variable.project.feature_available?(:variable_environment_scope)
         end
       }
-=======
-      expose :protected?, as: :protected, if: -> (entity, _) { entity.respond_to?(:protected?) }
->>>>>>> ce-com/master
     end
 
     class Pipeline < PipelineBasic