Resolve conflict in app/uploaders/job_artifact_uploader.rb

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/uploaders/job_artifact_uploader.rb

-<<<<<<< HEAD
 class JobArtifactUploader < ObjectStoreUploader
   storage_options Gitlab.config.artifacts
-=======
-class JobArtifactUploader < GitlabUploader
-  storage :file
->>>>>>> upstream/master
 
   def self.local_store_path
     Gitlab.config.artifacts.path
@@ -20,29 +15,8 @@ class JobArtifactUploader < GitlabUploader
     model.size
   end
 
-<<<<<<< HEAD
   private
 
-=======
-  def store_dir
-    default_local_path
-  end
-
-  def cache_dir
-    File.join(self.class.local_store_path, 'tmp/cache')
-  end
-
-  def work_dir
-    File.join(self.class.local_store_path, 'tmp/work')
-  end
-
-  private
-
-  def default_local_path
-    File.join(self.class.local_store_path, default_path)
-  end
-
->>>>>>> upstream/master
   def default_path
     creation_date = model.created_at.utc.strftime('%Y_%m_%d')