mirror of
https://github.com/jerryc127/hexo-theme-butterfly.git
synced 2026-10-03 22:22:00 +08:00
Fix merge conflicts
This commit is contained in:
commit
ec1a226774
4 files changed
+22
-3
No files matched your search
@@ -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,
|
||||
|
||||
@@ -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 => {
|
||||
|
||||
Reference in new issue
Block a user