Merge branch 'master' of github.com:hanyudeye/hanyudeye.github.io

hanyudeye · Jun 13, 2024 · e39a77e · e39a77e
2 parents 1830622 + a0237d8
commit e39a77e
Show file tree

Hide file tree

Showing 43 changed files with 457 additions and 786 deletions.
diff --git a/book/index.html b/book/index.html
diff --git a/books/1984/index.html b/books/1984/index.html
@@ -62,11 +62,7 @@
 
 
 
-<<<<<<< HEAD
-<meta name="generator" content="Hugo 0.111.3 with theme even" />
-=======
 <meta name="generator" content="Hugo 0.117.0 with theme even" />
->>>>>>> 7056c33b0b6e18e21f64baccbee03938de2dbe44
 
 
 <link rel="canonical" href="https://aming.xyz/books/1984/" />
@@ -165,15 +161,6 @@
       <div class="content-wrapper">
         <div id="content" class="content">
           <article class="post">
-<<<<<<< HEAD
-  <div class="post-content">
-    <p>乔治•奥威尔代表作。刻画了人类在极权主义社会的生存状态，有若一个永不退色的警示标签，警醒世人提防这种预想中的黑暗成为现实。历经几十年，其生命力益显强大，被誉为20世纪影响最为深远的文学经典之一。</p>
-<p>It was a bright cold day in April, and the clocks were striking thirteen. Winston Smith, his chin nuzzled into his breast in an effort to escape the vile wind, slipped quickly through the glass doors of Victory Mansions, though not quickly enough to prevent a swirl of gritty dust from entering along with him.</p>
-<p>It was a bright cold day in April, bright 明亮的，聪明的 cold day ,it was a bright cold day in April ，and the clocks were striking 惊人的，罢工 thirteen. Winston Smith, his chin 下巴， 颏 nuzzled 将鼻插入， into his breast 胸部  in an effort 努力 to escape the vile 恶劣的  wind 风 ，slipped</p>
-
-  </div>
-</article>
-=======
 
     <header class="post-header">
       <h1 class="post-title">1984</h1>
@@ -210,7 +197,6 @@ <h1 class="post-title">1984</h1>
       </nav>
     </footer>
   </article>
->>>>>>> 7056c33b0b6e18e21f64baccbee03938de2dbe44
         </div>
 
 

diff --git a/books/epub/index.html b/books/epub/index.html
@@ -62,11 +62,7 @@
 
 
 
-<<<<<<< HEAD
-<meta name="generator" content="Hugo 0.111.3 with theme even" />
-=======
 <meta name="generator" content="Hugo 0.117.0 with theme even" />
->>>>>>> 7056c33b0b6e18e21f64baccbee03938de2dbe44
 
 
 <link rel="canonical" href="https://aming.xyz/books/epub/" />
@@ -165,10 +161,6 @@
       <div class="content-wrapper">
         <div id="content" class="content">
           <article class="post">
-<<<<<<< HEAD
-  <div class="post-content">
-    <ul>
-=======
 
     <header class="post-header">
       <h1 class="post-title">hello</h1>
@@ -187,7 +179,6 @@ <h1 class="post-title">hello</h1>
 
     <div class="post-content">
       <ul>
->>>>>>> 7056c33b0b6e18e21f64baccbee03938de2dbe44
 <li>Key bindings</li>
 </ul>
 <p>| Key binding | Description         |
@@ -205,10 +196,6 @@ <h1 class="post-title">hello</h1>
 | ~g V~       | View content source |</p>
 <p>Hint: use ~SPC w c~ to center the buffer.</p>
 
-<<<<<<< HEAD
-  </div>
-</article>
-=======
     </div>
 
 
@@ -224,7 +211,6 @@ <h1 class="post-title">hello</h1>
       </nav>
     </footer>
   </article>
->>>>>>> 7056c33b0b6e18e21f64baccbee03938de2dbe44
         </div>
 
 

diff --git a/books/index.html b/books/index.html
@@ -42,11 +42,7 @@
 
   </style>
 
-<<<<<<< HEAD
-  <title>归档 - 思维</title>
-=======
   <title>思维</title>
->>>>>>> 7056c33b0b6e18e21f64baccbee03938de2dbe44
   <meta name="renderer" content="webkit" />
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>
 
@@ -66,11 +62,7 @@
 
 
 
-<<<<<<< HEAD
-<meta name="generator" content="Hugo 0.111.3 with theme even" />
-=======
 <meta name="generator" content="Hugo 0.117.0 with theme even" />
->>>>>>> 7056c33b0b6e18e21f64baccbee03938de2dbe44
 
 
 <link rel="canonical" href="https://aming.xyz/books/" />
@@ -165,40 +157,6 @@
     <main id="main" class="main">
       <div class="content-wrapper">
         <div id="content" class="content">
-<<<<<<< HEAD
-
-<section id="archive" class="archive">
-      <div class="collection-title">
-        <h2 class="archive-year">2024</h2>
-      </div>
-
-    <div class="archive-post">
-      <span class="archive-post-time">
-        05-06
-      </span>
-      <span class="archive-post-title">
-        <a href="/books/epub/" class="archive-post-link">
-          hello
-        </a>
-      </span>
-    </div>
-
-    <div class="archive-post">
-      <span class="archive-post-time">
-        05-06
-      </span>
-      <span class="archive-post-title">
-        <a href="/books/1984/" class="archive-post-link">
-          1984
-        </a>
-      </span>
-    </div></section>
-
-<nav class="pagination">
-
-
-</nav>
-=======
           <section id="posts" class="posts">
 
 <article class="post">
@@ -255,7 +213,6 @@ <h1 class="post-title"><a class="post-link" href="/books/1984/">1984</a></h1>
 
 
   </nav>
->>>>>>> 7056c33b0b6e18e21f64baccbee03938de2dbe44
         </div>
 
 

diff --git a/categories/books/index.html b/categories/books/index.html
@@ -62,11 +62,7 @@
 
 
 
-<<<<<<< HEAD
-<meta name="generator" content="Hugo 0.111.3 with theme even" />
-=======
 <meta name="generator" content="Hugo 0.117.0 with theme even" />
->>>>>>> 7056c33b0b6e18e21f64baccbee03938de2dbe44
 
 
 <link rel="canonical" href="https://aming.xyz/categories/books/" />

diff --git a/categories/index.xml b/categories/index.xml
@@ -43,6 +43,15 @@
       <description></description>
     </item>
 
+    <item>
+      <title>books</title>
+      <link>https://aming.xyz/categories/books/</link>
+      <pubDate>Mon, 06 May 2024 20:53:48 +0800</pubDate>
+
+      <guid>https://aming.xyz/categories/books/</guid>
+      <description></description>
+    </item>
+
     <item>
       <title>技术</title>
       <link>https://aming.xyz/categories/%E6%8A%80%E6%9C%AF/</link>

diff --git a/categories/生物/index.html b/categories/生物/index.html
@@ -62,7 +62,7 @@
 
 
 
-<meta name="generator" content="Hugo 0.111.3 with theme even" />
+<meta name="generator" content="Hugo 0.117.0 with theme even" />
 
 
 <link rel="canonical" href="https://aming.xyz/categories/%E7%94%9F%E7%89%A9/" />

diff --git a/categories/经济/index.html b/categories/经济/index.html
@@ -62,7 +62,7 @@
 
 
 
-<meta name="generator" content="Hugo 0.111.3 with theme even" />
+<meta name="generator" content="Hugo 0.117.0 with theme even" />
 
 
 <link rel="canonical" href="https://aming.xyz/categories/%E7%BB%8F%E6%B5%8E/" />

diff --git a/doing/24-2-27零基础如何自学吉他吉他自学看这一篇就够了超长干货-知乎/index.html b/doing/24-2-27零基础如何自学吉他吉他自学看这一篇就够了超长干货-知乎/index.html
@@ -62,7 +62,7 @@
 
 
 
-<meta name="generator" content="Hugo 0.111.3 with theme even" />
+<meta name="generator" content="Hugo 0.117.0 with theme even" />
 
 
 <link rel="canonical" href="https://aming.xyz/doing/24-2-27%E9%9B%B6%E5%9F%BA%E7%A1%80%E5%A6%82%E4%BD%95%E8%87%AA%E5%AD%A6%E5%90%89%E4%BB%96%E5%90%89%E4%BB%96%E8%87%AA%E5%AD%A6%E7%9C%8B%E8%BF%99%E4%B8%80%E7%AF%87%E5%B0%B1%E5%A4%9F%E4%BA%86%E8%B6%85%E9%95%BF%E5%B9%B2%E8%B4%A7-%E7%9F%A5%E4%B9%8E/" />

diff --git a/doing/index.html b/doing/index.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html>
 <html lang="zh-cn">
 <head>
@@ -63,7 +62,11 @@
 
 
 
+<<<<<<< HEAD
 <meta name="generator" content="Hugo 0.111.3 with theme even" />
+=======
+<meta name="generator" content="Hugo 0.117.0 with theme even" />
+>>>>>>> a0237d8747a56c7c3d7c3506a922716d2243ce63
 
 
 <link rel="canonical" href="https://aming.xyz/doing/" />
@@ -159,7 +162,10 @@
       <div class="content-wrapper">
         <div id="content" class="content">
           <section id="posts" class="posts">
+<<<<<<< HEAD
 
+=======
+>>>>>>> a0237d8747a56c7c3d7c3506a922716d2243ce63
     <article class="post">
   <header class="post-header">
     <h1 class="post-title"><a class="post-link" href="/doing/%E4%BA%BA%E7%94%9F%E5%A4%8D%E6%9D%82/">人生复杂</a></h1>
@@ -284,6 +290,10 @@ <h1 class="post-title"><a class="post-link" href="/doing/24-2-27%E9%9B%B6%E5%9F%
   <nav class="pagination">
 
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> a0237d8747a56c7c3d7c3506a922716d2243ce63
   </nav>
         </div>
 
@@ -347,4 +357,7 @@ <h1 class="post-title"><a class="post-link" href="/doing/24-2-27%E9%9B%B6%E5%9F%
 
 </body>
 </html>
+<<<<<<< HEAD
 
+=======
+>>>>>>> a0237d8747a56c7c3d7c3506a922716d2243ce63
diff --git a/doing/working/index.html b/doing/working/index.html
@@ -62,7 +62,7 @@
 
 
 
-<meta name="generator" content="Hugo 0.111.3 with theme even" />
+<meta name="generator" content="Hugo 0.117.0 with theme even" />
 
 
 <link rel="canonical" href="https://aming.xyz/doing/working/" />

diff --git a/doing/人生复杂/index.html b/doing/人生复杂/index.html
@@ -62,7 +62,7 @@
 
 
 
-<meta name="generator" content="Hugo 0.111.3 with theme even" />
+<meta name="generator" content="Hugo 0.117.0 with theme even" />
 
 
 <link rel="canonical" href="https://aming.xyz/doing/%E4%BA%BA%E7%94%9F%E5%A4%8D%E6%9D%82/" />

diff --git a/doing/如何进行内容创作/index.html b/doing/如何进行内容创作/index.html
@@ -62,7 +62,7 @@
 
 
 
-<meta name="generator" content="Hugo 0.111.3 with theme even" />
+<meta name="generator" content="Hugo 0.117.0 with theme even" />
 
 
 <link rel="canonical" href="https://aming.xyz/doing/%E5%A6%82%E4%BD%95%E8%BF%9B%E8%A1%8C%E5%86%85%E5%AE%B9%E5%88%9B%E4%BD%9C/" />

diff --git a/index.json b/index.json
Original file line number	Diff line number	Diff line change
Expand Up		@@ -62,7 +62,7 @@



		<meta name="generator" content="Hugo 0.111.3 with theme even" />
		<meta name="generator" content="Hugo 0.117.0 with theme even" />


		<link rel="canonical" href="https://aming.xyz/categories/%E7%94%9F%E7%89%A9/" />
Expand Down