Skip to content

G
gitlab-ce
Commit 000360db authored by Robert Speicher's avatar Robert Speicher
Browse files
Options

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

parent d3612b5a
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/views/admin/application_settings/_help_page.html.haml
View file @ 000360db
...@@ -3,13 +3,10 @@ ...@@ -3,13 +3,10 @@
%fieldset %fieldset
.form-group .form-group
<<<<<<< HEAD
= f.label :help_text, class: 'label-bold' = f.label :help_text, class: 'label-bold'
= f.text_area :help_text, class: 'form-control', rows: 4 = f.text_area :help_text, class: 'form-control', rows: 4
.form-text.text-muted Markdown enabled .form-text.text-muted Markdown enabled
.form-group .form-group
=======
>>>>>>> upstream/master
= f.label :help_page_text, class: 'label-bold' = f.label :help_page_text, class: 'label-bold'
= f.text_area :help_page_text, class: 'form-control', rows: 4 = f.text_area :help_page_text, class: 'form-control', rows: 4
.form-text.text-muted Markdown enabled .form-text.text-muted Markdown enabled
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7