Fix conflict in app/views/import/fogbugz/new.html.haml

app/views/import/fogbugz/new.html.haml

@@ -11,17 +11,6 @@
     In the next steps, you'll be able to map users and select the projects
     you want to import.
   .form-group.row
-<<<<<<< HEAD
-    = label_tag :uri, 'FogBugz URL', class: 'col-form-label'
-    .col-sm-4
-      = text_field_tag :uri, nil, placeholder: 'https://mycompany.fogbugz.com', class: 'form-control'
-  .form-group.row
-    = label_tag :email, 'FogBugz Email', class: 'col-form-label'
-    .col-sm-4
-      = text_field_tag :email, nil, class: 'form-control'
-  .form-group.row
-    = label_tag :password, 'FogBugz Password', class: 'col-form-label'
-=======
     = label_tag :uri, 'FogBugz URL', class: 'col-form-label col-sm-8'
     .col-sm-4
       = text_field_tag :uri, nil, placeholder: 'https://mycompany.fogbugz.com', class: 'form-control'
@@ -31,7 +20,6 @@
       = text_field_tag :email, nil, class: 'form-control'
   .form-group.row
     = label_tag :password, 'FogBugz Password', class: 'col-form-label col-sm-8'
->>>>>>> gitlab-ce/master
     .col-sm-4
       = password_field_tag :password, nil, class: 'form-control'
   .form-actions