From 4ca2aeafbb3c753d98ba849fa5ebf817049b5803 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 02 九月 2025 11:49:13 +0800
Subject: [PATCH] 合并冲突
---
index.html | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/index.html b/index.html
index cfb56fa..4c08c54 100644
--- a/index.html
+++ b/index.html
@@ -7,7 +7,7 @@
<meta name="renderer" content="webkit">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="icon" href="/ZQHXico.ico">
- <title>涓己鎭掑叴绠＄悊淇℃伅绯荤粺</title>
+ <title>涓己鎭掑叴绠＄悊绯荤粺</title>
<!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
<style>
html,
--
Gitblit v1.9.3