Resolve conflict in app/assets/javascripts/dispatcher.js

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/assets/javascripts/dispatcher.js

@@ -57,22 +57,10 @@ var Dispatcher;
         case 'projects:commits:show':
         case 'projects:show':
         case 'groups:show':
-<<<<<<< HEAD
-        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);
-=======
         case 'projects:tree:show':
         case 'projects:find_file:show':
         case 'projects:blob:show':
         case 'projects:blame:show':
->>>>>>> upstream/master
           shortcut_handler = true;
           break;
         case 'groups:labels:new':