laravelcm
diff --git a/‎public/css/app.css
Lines changed: 0 additions & 3 deletions b/‎public/css/app.css
Lines changed: 0 additions & 3 deletions
diff --git a/‎public/js/app.js
Lines changed: 1 addition & 5 deletions b/‎public/js/app.js
Lines changed: 1 addition & 5 deletions
diff --git a/‎public/mix-manifest.json
Lines changed: 0 additions & 5 deletions b/‎public/mix-manifest.json
Lines changed: 0 additions & 5 deletions
@@ -1,10 +1,5 @@
 {
-<<<<<<< HEAD
     "/js/app.js": "/js/app.js?id=d891a2d14ba2c320f58fd39d97107432",
     "/css/app.css": "/css/app.css?id=eaeae4ed6500cc10a072b4753147ef7f",
-=======
-    "/js/app.js": "/js/app.js?id=14e78ed3da0550befb1ae94a465013f5",
-    "/css/app.css": "/css/app.css?id=e949df09924e368d035a31b5f215b118",
->>>>>>> 56f1c50 (update assets)
     "/css/filament.css": "/css/filament.css?id=31807c66ef04b2d10d4b1a197a767d07"
 }
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,5 @@`
`1`	`1`	`{`
`2`		`-<<<<<<< HEAD`
`3`	`2`	`"/js/app.js": "/js/app.js?id=d891a2d14ba2c320f58fd39d97107432",`
`4`	`3`	`"/css/app.css": "/css/app.css?id=eaeae4ed6500cc10a072b4753147ef7f",`
`5`		`-=======`
`6`		`- "/js/app.js": "/js/app.js?id=14e78ed3da0550befb1ae94a465013f5",`
`7`		`- "/css/app.css": "/css/app.css?id=e949df09924e368d035a31b5f215b118",`
`8`		`->>>>>>> 56f1c50 (update assets)`
`9`	`4`	`"/css/filament.css": "/css/filament.css?id=31807c66ef04b2d10d4b1a197a767d07"`
`10`	`5`	`}`