Resolve conflict at project new page

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

Resolve conflict at project new page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
54b90f94 · Dmitriy Zaporozhets · 9e9ab32b · 54b90f94
Commit 54b90f94 authored Apr 24, 2017 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 8 deletions

app/views/projects/new.html.haml app/views/projects/new.html.haml +3 -8

No files found.
--- a/app/views/projects/new.html.haml
+++ b/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'));
  });