Remove banner

glefloch · Dec 28, 2017 · c97a1cd · c97a1cd
1 parent 5eb31e5
commit c97a1cd
Showing 1 changed file with 0 additions and 12 deletions.
diff --git a/src/app/showcase/app.component.html b/src/app/showcase/app.component.html
@@ -248,18 +248,6 @@
     </div>
 
     <div id="layout-content">
-<<<<<<< HEAD
-=======
-
-        <div class="notification-topbar" [@notificationTopbar]="notification ? 'visible' : 'hidden'">
-          <a href="#">
-            <img class="notification-topbar-image" src="assets/showcase/images/prime-showcases-notification-topbar-text.png" alt="Showcase Notification Topbar" />
-            <img class="notification-topbar-image-mobile" src="assets/showcase/images/prime-showcases-notification-topbar-text-mobile.png" alt="Showcase Notification Topbar" />
-            <i class="notification-topbar-close fa fa-lg fa-times-circle" (click)="closeNotification($event)"></i>
-          </a>
-        </div>
-
->>>>>>> origin/master
         <div>
             <router-outlet></router-outlet>
         </div>