Merge branch 'main' of https://github.com/xinshenghu/xinshenghu.githu…

…b.io # Conflicts: # index.htm
xinshenghu · May 21, 2024 · da4e8dd · da4e8dd
2 parents ee4813a + b79f616
commit da4e8dd
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/index.htm b/index.htm
@@ -56,10 +56,23 @@ <h1>个人网站</h1>
         <ul class="link-list">
             <li><a href="https://xinshenghu.github.io/html5/luping.html" target="_blank">录屏</a></li>
             <li><a href="https://xinshenghu.github.io/chatpage/index.htm" target="_blank">chatgpt自动生成网站</a></li>
+<<<<<<< HEAD
             <li><a href="https://xinshenghu.github.io/templatepage/changan/" target="_blank">templatepage</a></li>
             <li><a href="https://xinshenghu.github.io/html5/" target="_blank">html5</a></li>
+=======
+
+            <li><a href="https://xinshenghu.github.io/templatepage/changan/" target="_blank">模板 西安 </a></li>
+            <li><a href="https://xinshenghu.github.io/html5/tianqi/index.html target="_blank">天气</a></li>
+
+            <li><a href="https://xinshenghu.github.io/html5/fanzhuanpintu/index.html" target="_blank">jQuery 翻转拼图游戏</a></li>
+            <li><a href="https://xinshenghu.github.io/hexopublish/" target="_blank">hexo</a></li>
+>>>>>>> b79f616a654f52ff7fd6538445f01d59d9113b46
 
         </ul>
     </div>
 </body>
+<<<<<<< HEAD
+</html>
+=======
 </html>
+>>>>>>> b79f616a654f52ff7fd6538445f01d59d9113b46