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

de6d43f7 · Clement Ho · 8a999fd1 · de6d43f7
Commit de6d43f7 authored May 25, 2018 by Clement Ho
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

app/views/admin/application_settings/_help_page.html.haml app/views/admin/application_settings/_help_page.html.haml +1 -4

No files found.
--- a/app/views/admin/application_settings/_help_page.html.haml
+++ b/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 col-sm-2'
-      = f.label :help_text, class: 'col-form-label'
      .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