更新readme文件

wbbk · Oct 16, 2024 · 77961bd · 77961bd
1 parent ba746c0
commit 77961bd
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -13,12 +13,8 @@ pyinstaller code2exe.spec --clean
 
 （可选，配置upx进行包压缩）
 
-<<<<<<< HEAD
 ![iShot_2024-10-16_19.10.56](./webpictures/demo.png)
 =======
-![iShot_2024-10-16_19.10.56](/Users/wubin/Pictures/iShot_2024-10-16_19.10.56.png)
->>>>>>> 3accb5c6713120f1e15637cb9314b630138b39b1
-
 已实现功能：
 
 启动APP