Food/food_server
3
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
szdot 2025-05-11 17:11:38 +08:00
parent 6bcb72ec0c
commit 9b1a577a08
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
index.html
View File

@ -1,2 +1,7 @@
<<<<<<< Updated upstream
<a href="app-debug.apk">debug</a> <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