test

解决冲突
2025-05-11 17:15:16 +08:00 · 2025-05-11 17:12:38 +08:00 · 2025-05-11 17:11:38 +08:00
3 changed files with 6 additions and 1 deletions
--- a/a.apk
+++ b/a.apk
--- 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>
+<a href="app-release.apk">release</a>
+=======
+<a href="app-debug.apk">hello world</a>
+<a href="a.apk">hello world</a>
+>>>>>>> Stashed changes
--- a/nginx.htaccess
+++ b/nginx.htaccess
Author	SHA1	Message	Date
szdot	0d04e69c54	test	2025-05-11 17:15:16 +08:00
szdot	bd24fa28ec	test	2025-05-11 17:12:38 +08:00
szdot	9b1a577a08	解决冲突	2025-05-11 17:11:38 +08:00