Fix merge conflix

2025-10-14 11:24:10 +07:00
parent c62b05d10e
commit 929913003a
2 changed files with 0 additions and 10 deletions
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 4ed0dfeaea062ad4b9990837c319097b
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 3b9d74e7123c6e144ae35ceb982d00de