fixed conflicts in `app/assets/javascripts/dispatcher.js`

[ci skip]

fixed conflicts in `app/assets/javascripts/dispatcher.js`
[ci skip]
4d45d6c9 · Phil Hughes · 584c8d09 · 4d45d6c9
Commit 4d45d6c9 authored Jan 16, 2018 by Phil Hughes
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/assets/javascripts/dispatcher.js app/assets/javascripts/dispatcher.js +0 -3

No files found.
--- a/app/assets/javascripts/dispatcher.js
+++ b/app/assets/javascripts/dispatcher.js
@@ -229,12 +229,9 @@ import initLDAPGroupsSelect from 'ee/ldap_groups_select'; // eslint-disable-line
          import('./pages/groups/milestones/edit')
            .then(callDefault)
            .catch(fail);
-<<<<<<< HEAD
          break;
        case 'groups:epics:show':
          new ZenMode();
-=======
->>>>>>> upstream/master
          break;
        case 'projects:compare:show':
          new Diff();