Fix merge conflicts

2020-05-16 18:07:32 +02:00 · 2020-05-16 18:07:32 +02:00 · 6a596bd497
commit 6a596bd497
parent dd80697e61
10 changed files with 13 additions and 14 deletions
--- a/src/components/apphost.js
+++ b/src/components/apphost.js
@ -359,7 +359,6 @@ define(['appSettings', 'browser', 'events', 'htmlMediaHelper', 'webSettings', 'g
            return -1 !== supportedFeatures.indexOf(command.toLowerCase());
        },
        preferVisualCards: browser.android || browser.chrome,
-        moreIcon: browser.android ? 'more_vert' : 'more_horiz',
        getSyncProfile: getSyncProfile,
        getDefaultLayout: function () {
            if (window.NativeShell) {