From 9b1a577a088ff46564136ad772507e77d22e8bde Mon Sep 17 00:00:00 2001
From: szdot <szdot@qq.com>
Date: Sun, 11 May 2025 17:11:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.html | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 7f3cb83..21597f4 100644
--- a/index.html
+++ b/index.html
@@ -1,2 +1,7 @@
+<<<<<<< Updated upstream
 <a href="app-debug.apk">debug</a>
-<a href="app-release.apk">release</a>
\ No newline at end of file
+<a href="app-release.apk">release</a>
+=======
+<a href="app-debug.apk">hello world</a>
+<a href="a.apk">hello world</a>
+>>>>>>> Stashed changes