Resolve conflict at project new page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

app/views/projects/new.html.haml

@@ -147,14 +147,9 @@
 
   $('#project_import_url').disable();
   $('.import_git').click(function( event ) {
-<<<<<<< HEAD
-    $projectImportUrl = $('#project_import_url')
-    $projectMirror = $('#project_mirror')
-
-    $projectImportUrl.attr('disabled', !$projectImportUrl.attr('disabled'))
-    $projectMirror.attr('disabled', !$projectMirror.attr('disabled'))
-=======
     $projectImportUrl = $('#project_import_url');
     $projectImportUrl.attr('disabled', !$projectImportUrl.attr('disabled'));
->>>>>>> ce-com/master
+
+    $projectImportUrl.attr('disabled', !$projectImportUrl.attr('disabled'));
+    $projectMirror.attr('disabled', !$projectMirror.attr('disabled'));
   });