From 8f182e26246cae1a92dd53e3a8bc05453e94bcd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=9D=B0?= <bestsongj@163.com>
Date: Tue, 22 Jul 2025 14:54:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vercel/project.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.vercel/project.json b/.vercel/project.json
index 61bf4ee..67e3e93 100644
--- a/.vercel/project.json
+++ b/.vercel/project.json
@@ -1,5 +1 @@
-<<<<<<< HEAD
-{"projectName":"trae_8qnxf0if"}
-=======
 {"projectName":"trae_zf0uu3bt"}
->>>>>>> milestone-20250723-众筹