Resolve conflict in lib/gitlab/workhorse.rb

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

lib/gitlab/workhorse.rb

@@ -121,7 +121,6 @@ module Gitlab
         ]
       end
 
-<<<<<<< HEAD
       def send_artifacts_entry(build, entry)
         file = build.artifacts_file
         archive =
@@ -134,12 +133,6 @@ module Gitlab
         params = {
           'Archive' => archive,
           'Entry' => Base64.encode64(entry.path)
-=======
-      def send_artifacts_entry(build, path)
-        params = {
-          'Archive' => build.artifacts_file.path,
-          'Entry' => Base64.encode64(path.to_s)
->>>>>>> upstream/master
         }
 
         [