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

5dc05091 · Mario de la Ossa · c0940b7f · 5dc05091
Commit 5dc05091 authored Feb 05, 2018 by Mario de la Ossa
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/views/help/index.html.haml app/views/help/index.html.haml +0 -4

No files found.
--- a/app/views/help/index.html.haml
+++ b/app/views/help/index.html.haml
@@ -2,11 +2,7 @@

 %div
 - if Gitlab::CurrentSettings.help_page_text.present?
-<<<<<<< HEAD
  = markdown(Gitlab::CurrentSettings.help_page_text)
-=======
-  = markdown_field(Gitlab::CurrentSettings.current_application_settings, :help_page_text)
->>>>>>> upstream/master
  %hr

 %h1