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

e8d70ec6 · Toon Claes · c9330f1c · e8d70ec6
Commit e8d70ec6 authored Mar 23, 2018 by Toon Claes
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -8,10 +8,7 @@
      = render "layouts/header/ee_license_banner"
      = render "layouts/broadcast"
      = render 'layouts/header/read_only_banner'
-<<<<<<< HEAD
      = render "layouts/nav/ee/classification_level_banner"
-=======
->>>>>>> upstream/master
      = yield :flash_message
      - unless @hide_breadcrumbs
        = render "layouts/nav/breadcrumbs"