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