Merge pull request #10327 from HansGruber51/patch-1
Update manifest.json
This commit is contained in:
commit
7b02668d4b
|
|
@ -372,12 +372,8 @@
|
||||||
"src": "resources/js/setup/setup.js"
|
"src": "resources/js/setup/setup.js"
|
||||||
},
|
},
|
||||||
"resources/sass/app.scss": {
|
"resources/sass/app.scss": {
|
||||||
<<<<<<< HEAD
|
|
||||||
"file": "assets/app-039bd735.css",
|
"file": "assets/app-039bd735.css",
|
||||||
=======
|
|
||||||
"file": "assets/app-9454bf28.css",
|
|
||||||
>>>>>>> v5-develop
|
|
||||||
"isEntry": true,
|
"isEntry": true,
|
||||||
"src": "resources/sass/app.scss"
|
"src": "resources/sass/app.scss"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue