resolve conflicts on app/views/layouts/devise.html.haml

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

Showing with 0 additions and 3 deletions

app/views/layouts/devise.html.haml app/views/layouts/devise.html.haml +0 -3

No files found.
--- a/app/views/layouts/devise.html.haml
+++ b/app/views/layouts/devise.html.haml
@@ -28,14 +28,11 @@

              - if Gitlab::CurrentSettings.sign_in_text.present?
                = markdown_field(Gitlab::CurrentSettings.current_application_settings, :sign_in_text)
-<<<<<<< HEAD
              - if Gitlab::CurrentSettings.help_text.present?
                %h3 Need help?
                %hr
                %p.slead
                  = markdown(Gitlab::CurrentSettings.help_text)
-=======
->>>>>>> upstream/master

      %hr.footer-fixed
      .container.footer-container