laravelcm
diff --git a/‎public/css/app.css
Lines changed: 8 additions & 0 deletions b/‎public/css/app.css
Lines changed: 8 additions & 0 deletions
diff --git a/‎public/css/filament.css
Lines changed: 4 additions & 0 deletions b/‎public/css/filament.css
Lines changed: 4 additions & 0 deletions
diff --git a/‎public/js/app.js
Lines changed: 5 additions & 1 deletion b/‎public/js/app.js
Lines changed: 5 additions & 1 deletion
diff --git a/‎public/mix-manifest.json
Lines changed: 6 additions & 0 deletions b/‎public/mix-manifest.json
Lines changed: 6 additions & 0 deletions
@@ -1,5 +1,11 @@
 {
+<<<<<<< HEAD
     "/js/app.js": "/js/app.js?id=d891a2d14ba2c320f58fd39d97107432",
     "/css/app.css": "/css/app.css?id=eaeae4ed6500cc10a072b4753147ef7f",
     "/css/filament.css": "/css/filament.css?id=31807c66ef04b2d10d4b1a197a767d07"
+=======
+    "/js/app.js": "/js/app.js?id=47334bd79ba1d01922e3019827d48a1d",
+    "/css/app.css": "/css/app.css?id=74e2d1bac51784b1efec62d77cbd7255",
+    "/css/filament.css": "/css/filament.css?id=a17407b5d32e1f306c0555aba48494f3"
+>>>>>>> 60bc9af (Fix notifications page (#82))
 }
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,11 @@`
`1`	`1`	`{`
	`2`	`+<<<<<<< HEAD`
`2`	`3`	`"/js/app.js": "/js/app.js?id=d891a2d14ba2c320f58fd39d97107432",`
`3`	`4`	`"/css/app.css": "/css/app.css?id=eaeae4ed6500cc10a072b4753147ef7f",`
`4`	`5`	`"/css/filament.css": "/css/filament.css?id=31807c66ef04b2d10d4b1a197a767d07"`
	`6`	`+=======`
	`7`	`+ "/js/app.js": "/js/app.js?id=47334bd79ba1d01922e3019827d48a1d",`
	`8`	`+ "/css/app.css": "/css/app.css?id=74e2d1bac51784b1efec62d77cbd7255",`
	`9`	`+ "/css/filament.css": "/css/filament.css?id=a17407b5d32e1f306c0555aba48494f3"`
	`10`	`+>>>>>>> 60bc9af (Fix notifications page (#82))`
`5`	`11`	`}`