🏷️ 更新2.3.0

layout/404.pug

@@ -20,11 +20,5 @@ html(lang=config.language data-theme=theme.display_mode)
         h1#error_title= '404'
         #error_subtitle= theme.error_404.subtitle
     include includes/rightside.pug
-<<<<<<< HEAD
-    include includes/search/index.pug
-    each item in theme.CDN_USE.js
-      script(src=url_for(item))
-=======
     !=partial('includes/search/index', {}, {cache:theme.fragment_cache})
->>>>>>> dev
     include includes/additional-js.pug

layout/includes/additional-js.pug

@@ -66,13 +66,9 @@ if theme.mermaid.enable
   include ./math/mermaid.pug
 
 if is_home()
-<<<<<<< HEAD
-  include ./head/subtitle.pug
-=======
   include ./head/subtitle.pug
 
 !=fragment_cache('injectBottom', function(){return injectHtml(theme.inject.bottom)})
 
 if theme.preloader
-  !=partial('includes/loading/loading-js', {}, {cache:theme.fragment_cache})
->>>>>>> dev
+  !=partial('includes/loading/loading-js', {}, {cache:theme.fragment_cache})

layout/includes/head.pug

@@ -10,16 +10,10 @@
 - var isSubtitle = config.subtitle ? ' - ' + config.subtitle : ''
 - var tabTitle = is_home() || !pageTitle ? config.title + isSubtitle : pageTitle + ' | ' + config.title
 
-<<<<<<< HEAD
-- var pageDescription = page.description || page.title || config.description
-- var pageKeywords
-- if (page.tags && page.tags.data) pageKeywords = page.tags.data.map(function(tag) {return tag.name;}).join(',')
-=======
 - var pageDescription = page_description()
 - var pageKeywords
 - if (page.keywords) pageKeywords = Array.isArray(page.keywords) ? (page.keywords).join(',') :  ([]).join(',') || page.keywords
 - else if (page.tags && page.tags.length) pageKeywords = page.tags.data.map(function(tag) {return tag.name;}).join(',')
->>>>>>> dev
 - else pageKeywords = Array.isArray(config.keywords) ? (config.keywords).join(','):  ([]).join(',') || config.keywords
 - var pageAuthor = config.email ? config.author + ',' + config.email : config.author
 - var pageCopyright = config.copyright || config.author
@@ -106,8 +100,5 @@ if theme.blog_title_font.font_link
 
 include ./head/config_site.pug
 include ./head/noscript.pug
-<<<<<<< HEAD
-=======
 
-!=fragment_cache('injectHead', function(){return injectHtml(theme.inject.head)})
->>>>>>> dev
+!=fragment_cache('injectHead', function(){return injectHtml(theme.inject.head)})