Resolve conflict in lib/gitlab/workhorse.rb

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

lib/gitlab/workhorse.rb

@@ -121,20 +121,13 @@ module Gitlab
         ]
       end
 
-<<<<<<< HEAD
-      def send_artifacts_entry(build, path)
+      def send_artifacts_entry(build, entry)
         file = build.artifacts_file
         archive = file.file_storage? ? file.path : file.url
 
         params = {
           'Archive' => archive,
-          'Entry' => Base64.encode64(path.to_s)
-=======
-      def send_artifacts_entry(build, entry)
-        params = {
-          'Archive' => build.artifacts_file.path,
           'Entry' => Base64.encode64(entry.to_s)
->>>>>>> upstream/master
         }
 
         [