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

ff7f3ec5 · Lin Jen-Shin · c8a77e38 · ff7f3ec5
Commit ff7f3ec5 authored Oct 24, 2018 by Lin Jen-Shin
Show 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
      = render "shared/ping_consent"
      - unless @hide_breadcrumbs