Commit 5dc05091 authored by Mario de la Ossa's avatar Mario de la Ossa

resolve conflicts on app/views/help/index.html.haml

parent c0940b7f
...@@ -2,11 +2,7 @@ ...@@ -2,11 +2,7 @@
%div %div
- if Gitlab::CurrentSettings.help_page_text.present? - if Gitlab::CurrentSettings.help_page_text.present?
<<<<<<< HEAD
= markdown(Gitlab::CurrentSettings.help_page_text) = markdown(Gitlab::CurrentSettings.help_page_text)
=======
= markdown_field(Gitlab::CurrentSettings.current_application_settings, :help_page_text)
>>>>>>> upstream/master
%hr %hr
%h1 %h1
......
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