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

000360db · Robert Speicher · d3612b5a · 000360db
Commit 000360db authored Jul 20, 2018 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/views/admin/application_settings/_help_page.html.haml app/views/admin/application_settings/_help_page.html.haml +0 -3

No files found.
--- a/app/views/admin/application_settings/_help_page.html.haml
+++ b/app/views/admin/application_settings/_help_page.html.haml
@@ -3,13 +3,10 @@

  %fieldset
    .form-group
-<<<<<<< HEAD
      = f.label :help_text, class: 'label-bold'
      = f.text_area :help_text, class: 'form-control', rows: 4
      .form-text.text-muted Markdown enabled
    .form-group
-=======
->>>>>>> upstream/master
      = f.label :help_page_text, class: 'label-bold'
      = f.text_area :help_page_text, class: 'form-control', rows: 4
      .form-text.text-muted Markdown enabled