fixed specs

app/assets/javascripts/dispatcher.js

@@ -72,7 +72,7 @@ import initLDAPGroupsSelect from 'ee/ldap_groups_select'; // eslint-disable-line
         return false;
       }
 
-      const fail = (e) => { throw e; Flash('Error loading dynamic module'); }
+      const fail = () => Flash('Error loading dynamic module');
       const callDefault = m => m.default();
 
       path = page.split(':');

app/assets/javascripts/projects/project_new.js

@@ -98,12 +98,15 @@ const bindEvents = () => {
   });
 
   $projectImportUrl.keyup(() => deriveProjectPathFromUrl($projectImportUrl));
+<<<<<<< HEAD
 
   $('.import_git').on('click', () => {
     const $projectMirror = $('#project_mirror');
 
     $projectMirror.attr('disabled', !$projectMirror.attr('disabled'));
   });
+=======
+>>>>>>> 8e629a4545... fixed specs
 };
 
 document.addEventListener('DOMContentLoaded', bindEvents);

spec/javascripts/projects/project_new_spec.js

-import projectNew from '~/pages/projects/shared/project_new';
+import projectNew from '~/projects/project_new';
 
-describe('New Project', () => {
+fdescribe('New Project', () => {
   let $projectImportUrl;
   let $projectPath;