From 5d2043f2e3c33808b6997298455b1a8e63c5f8ab Mon Sep 17 00:00:00 2001
From: dw <2196435763@qq.com>
Date: Fri, 25 Apr 2025 22:41:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=8F=98=E6=9B=B4=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/vcs.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 113f660..a933e05 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,9 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
-<<<<<<< HEAD
     <mapping directory="$PROJECT_DIR$/gym" vcs="Git" />
-=======
->>>>>>> develop
   </component>
 </project>
\ No newline at end of file