Resolve conflicts for app/views/layouts

app/views/layouts/devise.html.haml

@@ -38,13 +38,7 @@
       %hr.footer-fixed
       .container.footer-container
         .footer-links
-<<<<<<< HEAD
-          = link_to "Explore", explore_root_path
-          = link_to "Help", help_path
-          = link_to "About GitLab", "https://about.gitlab.com/"
-      = footer_message
-=======
           = link_to _("Explore"), explore_root_path
           = link_to _("Help"), help_path
           = link_to _("About GitLab"), "https://about.gitlab.com/"
->>>>>>> upstream/master
+      = footer_message

app/views/layouts/devise_empty.html.haml

@@ -13,13 +13,7 @@
     %hr
     .container
       .footer-links
-<<<<<<< HEAD
-        = link_to "Explore", explore_root_path
-        = link_to "Help", help_path
-        = link_to "About GitLab", "https://about.gitlab.com/"
-    = footer_message
-=======
         = link_to _("Explore"), explore_root_path
         = link_to _("Help"), help_path
         = link_to _("About GitLab"), "https://about.gitlab.com/"
->>>>>>> upstream/master
+    = footer_message

app/views/layouts/mailer.text.erb

 <%= yield -%>
 
 -- <%# signature marker %>
-<<<<<<< HEAD
-You're receiving this email because of your account on <%= Gitlab.config.gitlab.host %>.
-<%# EE-specific start %><%= render 'layouts/mailer/additional_text' %><%# EE-specific end %>
-=======
 <%= _("You're receiving this email because of your account on %{host}.") % { host: Gitlab.config.gitlab.host } %>
->>>>>>> upstream/master
+<%# EE-specific start %><%= render 'layouts/mailer/additional_text' %><%# EE-specific end %>

app/views/layouts/nav/sidebar/_admin.html.haml

@@ -88,12 +88,8 @@
           = nav_link(controller: :requests_profiles) do
             = link_to admin_requests_profiles_path, title: _('Requests Profiles') do
               %span
-<<<<<<< HEAD
-                Requests Profiles
-          = render 'layouts/nav/ee/new_admin_monitoring_sidebar'
-=======
                 = _('Requests Profiles')
->>>>>>> upstream/master
+          = render 'layouts/nav/ee/new_admin_monitoring_sidebar'
 
       = nav_link(controller: :broadcast_messages) do
         = link_to admin_broadcast_messages_path do

app/views/layouts/nav/sidebar/_profile.html.haml

@@ -27,8 +27,7 @@
           = nav_link(controller: [:accounts, :two_factor_auths], html_options: { class: "fly-out-top-item" } ) do
             = link_to profile_account_path do
               %strong.fly-out-top-item-name
-<<<<<<< HEAD
-                #{ _('Account') }
+                = _('Account')
       - if Gitlab::CurrentSettings.should_check_namespace_plan?
         = nav_link(controller: :billings) do
           = link_to profile_billings_path do
@@ -41,9 +40,6 @@
               = link_to profile_billings_path do
                 %strong.fly-out-top-item-name
                   #{ _('Billing') }
-=======
-                = _('Account')
->>>>>>> upstream/master
       - if Gitlab::CurrentSettings.user_oauth_applications?
         = nav_link(controller: 'oauth/applications') do
           = link_to applications_profile_path do
@@ -166,8 +162,7 @@
           = nav_link(path: 'profiles#audit_log', html_options: { class: "fly-out-top-item" } ) do
             = link_to audit_log_profile_path do
               %strong.fly-out-top-item-name
-<<<<<<< HEAD
-                #{ _('Authentication Log') }
+                = _('Authentication Log')
       = nav_link(path: 'profiles#pipeline_quota') do
         = link_to profile_pipeline_quota_path do
           .nav-icon-container
@@ -179,8 +174,5 @@
             = link_to profile_pipeline_quota_path do
               %strong.fly-out-top-item-name
                 #{ _('Pipeline quota') }
-=======
-                = _('Authentication Log')
->>>>>>> upstream/master
 
     = render 'shared/sidebar_toggle_button'