- Merged conflicts
This commit is contained in:
commit
66dadf7110
@ -4,12 +4,10 @@ return [
|
|||||||
'assets.normalize-css' => [
|
'assets.normalize-css' => [
|
||||||
'picea' => [
|
'picea' => [
|
||||||
'asset' => [
|
'asset' => [
|
||||||
'source' => [
|
[
|
||||||
[
|
'path' => implode(DIRECTORY_SEPARATOR, [ dirname(__DIR__), "asset", '' ]),
|
||||||
'path' => implode(DIRECTORY_SEPARATOR, [ dirname(__DIR__), "asset", '' ]),
|
'order' => 10
|
||||||
'order' => 10
|
]
|
||||||
]
|
|
||||||
],
|
|
||||||
]
|
]
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
|
Loading…
x
Reference in New Issue
Block a user