fix PR conflict
This commit is contained in:
parent
d8ad7b29d4
commit
b32d6bae16
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -10,7 +10,7 @@
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
function asset_path($filename) {
|
function asset_path($filename) {
|
||||||
$manifest_path = get_stylesheet_directory_uri() .'/rev-manifest.json';
|
$manifest_path = get_stylesheet_directory() .'/rev-manifest.json';
|
||||||
if ( file_exists($manifest_path ) ) {
|
if ( file_exists($manifest_path ) ) {
|
||||||
$manifest = json_decode( file_get_contents( $manifest_path ), TRUE );
|
$manifest = json_decode( file_get_contents( $manifest_path ), TRUE );
|
||||||
} else {
|
} else {
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,4 @@
|
||||||
|
{
|
||||||
|
"css/theme.min.css": "css/theme-7a3aa37604.min.css",
|
||||||
|
"js/theme.min.js": "js/theme-e677a2ace8.min.js"
|
||||||
|
}
|
Reference in New Issue