fixes merge issue, updates MB

2016-01-20 13:54:16 +01:00
parent 4e1e240f54
commit 1fd76731cd
3 changed files with 6 additions and 8 deletions
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
@@ -46,8 +46,6 @@
 			}
        ];

-            hotKeyWhenHidden: true,
-            hotKeyWhenHidden: true,
        vm.page.keyboardShortcutsOverview = [
 			{
 			    "name": localizationService.localize("main_sections"),