解决冲突2

7 months ago · 8fd0c09fec
1 changed files with 0 additions and 2 deletions
--- 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