Updated resources
This commit is contained in:
parent
19cf39786e
commit
a675dd685a
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -364,11 +364,7 @@
|
|||
"src": "resources/js/setup/setup.js"
|
||||
},
|
||||
"resources/sass/app.scss": {
|
||||
<<<<<<< HEAD
|
||||
"file": "assets/app-22043157.css",
|
||||
=======
|
||||
"file": "assets/app-61bfe239.css",
|
||||
>>>>>>> blockonomics-driver
|
||||
"file": "assets/app-9c3f71d4.css",
|
||||
"isEntry": true,
|
||||
"src": "resources/sass/app.scss"
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue