Solved project_new conflicts

app/assets/javascripts/projects/project_new.js

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