From e264d7f1cd438cc82a0e77ca92375b6d7155718f Mon Sep 17 00:00:00 2001
From: VelupriyaMohan <velupriyacse@gmail.com>
Date: Thu, 15 Sep 2022 19:48:49 -0700
Subject: [PATCH 1/2] shiva changes

---
 src/app/app.component.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/app/app.component.html b/src/app/app.component.html
index dd31f46..4be1219 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,3 +1,4 @@
+<!-- <ecommerce-alert [alertMsg]="alertMsg"></ecommerce-alert>shiva -->
 <ecommerce-loader></ecommerce-loader>
 <div class="pageContain">
     <ecommerce-header [custStatus]="custIsAuthenticated" [custName]="custName"></ecommerce-header>
@@ -5,3 +6,5 @@
     <ecommerce-alert [alertMsg]="alertMsg"></ecommerce-alert>
     <router-outlet></router-outlet>
 </div>
+<ecommerce-alert [alertMsg]="alertMsg"></ecommerce-alert>
+<ecommerce-alert [alertMsg]="alertMsg"></ecommerce-alert>
\ No newline at end of file

From c1557003bf6358146ee7630fb377406f8ba4314c Mon Sep 17 00:00:00 2001
From: VelupriyaMohan <velupriyacse@gmail.com>
Date: Thu, 15 Sep 2022 19:44:41 -0700
Subject: [PATCH 2/2] uccesfully rebased and commited...

---
 src/app/app.component.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/app/app.component.html b/src/app/app.component.html
index 4be1219..6161597 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,4 +1,6 @@
 <!-- <ecommerce-alert [alertMsg]="alertMsg"></ecommerce-alert>shiva -->
+<!-- <ecommerce-navbar></ecommerce-navbar> balaji changes -->
+<ecommerce-alert [alertMsg]="alertMsg"></ecommerce-alert>
 <ecommerce-loader></ecommerce-loader>
 <div class="pageContain">
     <ecommerce-header [custStatus]="custIsAuthenticated" [custName]="custName"></ecommerce-header>