Commit ff7f3ec5 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Resolve conflict for app/views/layouts/_page.html.haml

parent c8a77e38
...@@ -8,10 +8,7 @@ ...@@ -8,10 +8,7 @@
= render "layouts/header/ee_license_banner" = render "layouts/header/ee_license_banner"
= render "layouts/broadcast" = render "layouts/broadcast"
= render "layouts/header/read_only_banner" = render "layouts/header/read_only_banner"
<<<<<<< HEAD
= render "layouts/nav/ee/classification_level_banner" = render "layouts/nav/ee/classification_level_banner"
=======
>>>>>>> upstream/master
= yield :flash_message = yield :flash_message
= render "shared/ping_consent" = render "shared/ping_consent"
- unless @hide_breadcrumbs - unless @hide_breadcrumbs
......
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