Fix conflict in app/views/admin/application_settings/_help_page.html.haml

app/views/admin/application_settings/_help_page.html.haml

@@ -3,14 +3,11 @@
 
   %fieldset
     .form-group.row
-<<<<<<< HEAD
-      = f.label :help_text, class: 'col-form-label'
+      = f.label :help_text, class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.text_area :help_text, class: 'form-control', rows: 4
         .form-text.text-muted Markdown enabled
     .form-group.row
-=======
->>>>>>> gitlab-ce/master
       = f.label :help_page_text, class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.text_area :help_page_text, class: 'form-control', rows: 4