From 77961bdfe99547e52a5b48a6abf715cce932ea54 Mon Sep 17 00:00:00 2001
From: tyrone <18050152@qq.com>
Date: Wed, 16 Oct 2024 19:26:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0readme=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index e7efa01..866a8b6 100644
--- 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