Fix indention and bad conflict merge

app/assets/javascripts/dispatcher.js

@@ -12,7 +12,6 @@ import notificationsDropdown from './notifications_dropdown';
 import groupAvatar from './group_avatar';
 import GroupLabelSubscription from './group_label_subscription';
 import LineHighlighter from './line_highlighter';
-import CILintEditor from './ci_lint_editor';
 import groupsSelect from './groups_select';
 import Search from './search';
 import initAdmin from './admin';
@@ -406,8 +405,8 @@ import initLDAPGroupsSelect from 'ee/ldap_groups_select'; // eslint-disable-line
           break;
         case 'projects:activity':
           import('./pages/projects/activity')
-          .then(callDefault)
-          .catch(fail);
+            .then(callDefault)
+            .catch(fail);
           shortcut_handler = true;
           break;
         case 'projects:commits:show':
@@ -572,14 +571,14 @@ import initLDAPGroupsSelect from 'ee/ldap_groups_select'; // eslint-disable-line
           break;
         case 'projects:artifacts:browse':
           import('./pages/projects/artifacts/browse')
-          .then(callDefault)
-          .catch(fail);
+            .then(callDefault)
+            .catch(fail);
           shortcut_handler = true;
           break;
         case 'projects:artifacts:file':
           import('./pages/projects/artifacts/file')
-          .then(callDefault)
-          .catch(fail);
+            .then(callDefault)
+            .catch(fail);
           shortcut_handler = true;
           break;
         case 'help:index':