fix conflicts

internal/http/services/owncloud/ocdav/delete.go

@@ -19,6 +19,7 @@
 package ocdav
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 	"path"
@@ -30,11 +31,7 @@ import (
 	"go.opencensus.io/trace"
 )
 
-<<<<<<< HEAD
 func (s *svc) handlePathDelete(w http.ResponseWriter, r *http.Request, ns string) {
-=======
-func (s *svc) handleDelete(w http.ResponseWriter, r *http.Request, ns string) {
->>>>>>> dc5c2add... remove unusedf key
 	ctx := r.Context()
 	ctx, span := trace.StartSpan(ctx, "delete")
 	defer span.End()
@@ -54,23 +51,7 @@ func (s *svc) handleDelete(ctx context.Context, w http.ResponseWriter, r *http.R
 		return
 	}
 
-<<<<<<< HEAD
 	req := &provider.DeleteRequest{Ref: ref}
-=======
-	req := &provider.DeleteRequest{
-		Ref: &provider.Reference{
-			Path: fn,
-		},
-	}
-
-<<<<<<< HEAD
-	if err := s.deleteReceivedShare(ctx, fn, client, w, req); err != nil {
-		sublog.Error().Err(err).Msg("deleting shared resource")
-	}
-
->>>>>>> a7293b40... comment out fc
-=======
->>>>>>> ce52d290... move logic over to the reva gateway
 	res, err := client.Delete(ctx, req)
 	if err != nil {
 		log.Error().Err(err).Msg("error performing delete grpc request")