Fix merge issue

5 years ago · db6c454837
parent b4021bd2b0
commit db6c454837
2 changed files with 1 additions and 3 deletions
--- 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();
    }

 }
--- 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'];
                }
            }