fix rebase

.drone.star

@@ -903,7 +903,7 @@ def binaryReleases(ctx):
 
   return pipelines
 
-def binary(ctx, name):
+def binaryRelease(ctx, name):
   # uploads binary to https://download.owncloud.com/ocis/ocis/testing/
   target = '/ocis/%s/testing' % (ctx.repo.name.replace("ocis-", ""))
   if ctx.build.event == "tag":
@@ -929,19 +929,6 @@ def binary(ctx, name):
     'target': target,
   }
 
-
-=======
-    strip_prefix = 'ocis/dist/release/'
-    target = '/ocis/%s/%s' % (ctx.repo.name.replace("ocis-", ""), ctx.build.ref.replace("refs/tags/v", ""))
-  else:
-    strip_prefix = 'dist/release/'
-    target = '/ocis/%s/testing' % (ctx.repo.name.replace("ocis-", ""))
-<<<<<<< HEAD
-
->>>>>>> 2bbb5e06 (deduplicate in binary release)
-=======
-
->>>>>>> c72fd376 (generalize things)
   return {
     'kind': 'pipeline',
     'type': 'docker',