From db6c454837c633e4f1b83fe537f7bbb531527c9d Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 24 Jun 2020 11:45:34 +0200
Subject: [PATCH] Fix merge issue

---
 customize.dist/src/less2/include/drive.less | 2 --
 www/common/drive-ui.js                      | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/customize.dist/src/less2/include/drive.less b/customize.dist/src/less2/include/drive.less
index 9f569a0f9..c04c0d05b 100644
--- a/customize.dist/src/less2/include/drive.less
+++ b/customize.dist/src/less2/include/drive.less
@@ -4,7 +4,6 @@
 @import (reference) "./limit-bar.less";
 @import (reference) "./tokenfield.less";
 @import (reference) "./dropdown.less";
-@import (reference) "./buttons.less";
 
 .drive_main() {
     --LessLoader_require: LessLoader_currentFile();
@@ -935,7 +934,6 @@
     .cp-app-drive-button {
         order: 15;
         margin: 0 1em;
-        .buttons_main();
     }
 
 }
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index d7662b3df..cd375d16a 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -1334,7 +1334,7 @@ define([
                     break;
                 }
                 case 'trash': {
-                    show = ['remove', 'restore', 'properties'];
+                    show = ['remove', 'deleteowned', 'restore', 'properties'];
                 }
             }