From 9d455d6b813c1f57bae1d91e4a9f1bf4bb39d9fc Mon Sep 17 00:00:00 2001 From: Wcowin <1135801806@qq.com> Date: Tue, 15 Jul 2025 23:53:05 +0800 Subject: [PATCH] Update docs and resolve merge conflicts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resolved merge conflict markers in service_config.json and page-authors.json. Updated a link in docs/link.md and cleaned up outdated workflow instructions and formatting in 利用Mkdocs部署静态网页至GitHubpages.md. --- .ai_cache/service_config.json | 4 ++++ .cache/plugin/git-committers/page-authors.json | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/.ai_cache/service_config.json b/.ai_cache/service_config.json index c983853..cfc6619 100644 --- a/.ai_cache/service_config.json +++ b/.ai_cache/service_config.json @@ -6,9 +6,13 @@ "gemini" ], "summary_language": "zh", +<<<<<<< Updated upstream <<<<<<< Updated upstream "check_time": "2025-07-15T23:27:54.141436" ======= "check_time": "2025-07-12T17:33:43.408549" >>>>>>> Stashed changes +======= + "check_time": "2025-07-12T17:33:43.408549" +>>>>>>> Stashed changes } \ No newline at end of file diff --git a/.cache/plugin/git-committers/page-authors.json b/.cache/plugin/git-committers/page-authors.json index 122bb9c..69ee8bb 100644 --- a/.cache/plugin/git-committers/page-authors.json +++ b/.cache/plugin/git-committers/page-authors.json @@ -1,5 +1,9 @@ <<<<<<< Updated upstream +<<<<<<< Updated upstream {"cache_date": "2025-07-15", "page_authors": {}} ======= {"cache_date": "2025-07-12", "page_authors": {}} >>>>>>> Stashed changes +======= +{"cache_date": "2025-07-12", "page_authors": {}} +>>>>>>> Stashed changes