- Merged conflicts

This commit is contained in:
Dave M. 2023-10-18 12:28:48 +00:00
commit 66dadf7110

View File

@ -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 ]
]
],
] ]
], ],
], ],