Fix merge conflicts

This commit is contained in:
Jerry
2025-08-19 14:55:15 +08:00
Unverified
4 changed files with 22 additions and 3 deletions
+4 -1
View File
@@ -574,7 +574,10 @@ module.exports = {
enable: true,
option: null
},
structured_data: false,
structured_data: {
enable: false,
alternate_name: null
},
css_prefix: true,
inject: {
head: null,
+1 -1
View File
@@ -53,7 +53,7 @@ hexo.extend.helper.register('urlNoIndex', function (url = null, trailingIndex =
})
hexo.extend.helper.register('md5', function (path) {
return crypto.createHash('md5').update(decodeURI(this.url_for(path))).digest('hex')
return crypto.createHash('md5').update(decodeURI(this.url_for(path, {relative: false}))).digest('hex')
})
hexo.extend.helper.register('injectHtml', data => {