Resolve conflict in app/views/shared/_import_form.html.haml

Based on:

1. 0e85c50252dd43148488eacde57a882bd0b0a4ec
2. d19eaaed2d48e008abf94301a98e8ee806219071
3. 44c7f872219659d107fc01a62c8b5d6778ebbd74
Signed-off-by: Rémy Coutable <remy@rymai.me>

app/views/shared/_import_form.html.haml

@@ -14,7 +14,6 @@
         The import will time out after 15 minutes. For repositories that take longer, use a clone/push combination.
       %li
         To migrate an SVN repository, check out #{link_to "this document", help_page_path('workflow/importing/migrating_from_svn')}.
-<<<<<<< HEAD
       %li
         The Git LFS objects will <strong>not</strong> be imported.
       %li
@@ -22,7 +21,7 @@
         = link_to 'here', help_page_path('/workflow/repository_mirroring.md', anchor: 'ssh-authentication')
 
 .form-group
-  = f.label :mirror, class: 'control-label' do
+  = f.label :mirror, class: 'label-light' do
     = f.check_box :mirror, disabled: true
     %strong
       Mirror repository
@@ -31,5 +30,3 @@
     repository every hour. The Git LFS objects will not be synced.
 
 = f.hidden_field :mirror_user_id, value: current_user.id
-=======
->>>>>>> upstream/master