Update mix file

mckenziearts · mckenziearts · commit aae34e7bf7c1 · 2023-05-02T09:34:10.000+02:00
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,10 +1,4 @@
 {
-<<<<<<< HEAD
-    "/js/app.js": "/js/app.js?id=d891a2d14ba2c320f58fd39d97107432",
-    "/css/app.css": "/css/app.css?id=f883bd15acfcb8f7becc11f85ed68a34",
-    "/css/filament.css": "/css/filament.css?id=baef68e9b10c9ecd2c6e89260976385d"
-=======
     "/js/app.js": "/js/app.js?id=cfb3a1c355f3a16467153c28d697dfd6",
     "/css/app.css": "/css/app.css?id=3af27984478dd97b9f235dede4b2ea68"
->>>>>>> bc60080ea272e43e2531757378f02a16dfa02d06
 }

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,4 @@`
`1`	`1`	`{`
`2`		`-<<<<<<< HEAD`
`3`		`- "/js/app.js": "/js/app.js?id=d891a2d14ba2c320f58fd39d97107432",`
`4`		`- "/css/app.css": "/css/app.css?id=f883bd15acfcb8f7becc11f85ed68a34",`
`5`		`- "/css/filament.css": "/css/filament.css?id=baef68e9b10c9ecd2c6e89260976385d"`
`6`		`-=======`
`7`	`2`	`"/js/app.js": "/js/app.js?id=cfb3a1c355f3a16467153c28d697dfd6",`
`8`	`3`	`"/css/app.css": "/css/app.css?id=3af27984478dd97b9f235dede4b2ea68"`
`9`		`->>>>>>> bc60080ea272e43e2531757378f02a16dfa02d06`
`10`	`4`	`}`