laravelcm
diff --git a/‎public/css/app.css
Lines changed: 0 additions & 4 deletions b/‎public/css/app.css
Lines changed: 0 additions & 4 deletions
diff --git a/‎public/js/app.js
100755100644
Lines changed: 1 addition & 9 deletions b/‎public/js/app.js
100755100644
Lines changed: 1 addition & 9 deletions
diff --git a/‎public/mix-manifest.json
Lines changed: 0 additions & 9 deletions b/‎public/mix-manifest.json
Lines changed: 0 additions & 9 deletions
@@ -1,13 +1,4 @@
 {
-<<<<<<< HEAD
-<<<<<<< HEAD
-    "/js/app.js": "/js/app.js?id=67618e971ac9ca37c6e546e6f96fd9b7",
-=======
-    "/js/app.js": "/js/app.js?id=9dd3882ef08af9fa2765a4c27608ea95",
->>>>>>> 90b642bd1c4e06985c93a05445a6a9de1e29c246
-    "/css/app.css": "/css/app.css?id=3af27984478dd97b9f235dede4b2ea68"
-=======
     "/js/app.js": "/js/app.js?id=ddc8fa37fd058e1a878d06ff2dd04e98",
     "/css/app.css": "/css/app.css?id=c81faad7c99dc23b2559ae4fa79951ce"
->>>>>>> 5ad11079620f281bda8480af0a2562d3f8810ca3
 }
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,4 @@`
`1`	`1`	`{`
`2`		`-<<<<<<< HEAD`
`3`		`-<<<<<<< HEAD`
`4`		`- "/js/app.js": "/js/app.js?id=67618e971ac9ca37c6e546e6f96fd9b7",`
`5`		`-=======`
`6`		`- "/js/app.js": "/js/app.js?id=9dd3882ef08af9fa2765a4c27608ea95",`
`7`		`->>>>>>> 90b642bd1c4e06985c93a05445a6a9de1e29c246`
`8`		`- "/css/app.css": "/css/app.css?id=3af27984478dd97b9f235dede4b2ea68"`
`9`		`-=======`
`10`	`2`	`"/js/app.js": "/js/app.js?id=ddc8fa37fd058e1a878d06ff2dd04e98",`
`11`	`3`	`"/css/app.css": "/css/app.css?id=c81faad7c99dc23b2559ae4fa79951ce"`
`12`		`->>>>>>> 5ad11079620f281bda8480af0a2562d3f8810ca3`
`13`	`4`	`}`