Fix conflict in app/views/layouts/devise.html.haml

app/views/layouts/devise.html.haml

@@ -11,11 +11,7 @@
         .content
           = render "layouts/flash"
           .row
-<<<<<<< HEAD
-            .col-sm-7.brand-holder.float-left
-=======
             .col-sm-7.brand-holder
->>>>>>> gitlab-ce/master
               %h1
                 = brand_title
               = brand_image
@@ -31,16 +27,13 @@
 
               - 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)
-            .col-sm-5.float-right.new-session-forms-container
-=======
             .col-sm-5.new-session-forms-container
->>>>>>> gitlab-ce/master
               = yield
 
       %hr.footer-fixed