From 8fd0c09fec25b75749b41dfc81b9ae44f3313dbc Mon Sep 17 00:00:00 2001
From: yjm484 <171359351@qq.com>
Date: Fri, 16 May 2025 03:07:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=812?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset
index 0bd55054..b505e5d5 100644
--- a/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset
+++ b/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset
@@ -13,7 +13,6 @@ MonoBehaviour:
   m_Name: cardDeckList
   m_EditorClassIdentifier: 
   cardDeckList:
-<<<<<<< HEAD
   - 1010
   - 1005
   - 1010
@@ -39,4 +38,3 @@ MonoBehaviour:
   - 2032
   - 2001
   - 2019
->>>>>>> origin/dev-1217