Commit 479f0028 authored by Clement Ho's avatar Clement Ho

Resolve bad conflict for dispatcher

parent 1a35899f
......@@ -57,12 +57,17 @@ var Dispatcher;
case 'projects:commits:show':
case 'projects:show':
case 'groups:show':
case 'projects:tree:show':
case 'projects:find_file:show':
case 'projects:blob:show':
case 'projects:blame:show':
shortcut_handler = true;
break;
case 'projects:tree:show':
import(/* webpackChunkName: "ee_projects_edit" */ 'ee/pages/projects/tree/show')
.then(callDefault)
.catch(fail);
shortcut_handler = true;
break;
case 'groups:labels:new':
import('./pages/groups/labels/new')
.then(callDefault)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment