backup

2025-06-27 17:59:22 +08:00
parent 9ebba14bcf
commit 9a88eefe06
1 changed files with 4 additions and 0 deletions
--- a/Runtime/UI/TmpText.meta
+++ b/Runtime/UI/TmpText.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<<< HEAD:Release/Samples~/ConfigUIElement.meta
+guid: 7758a0679c9038144a4b0d007d44618f
+========
 guid: 85f1b523843f5884bb9f6b47500bccd0
+>>>>>>>> gitea-Srouce/master:Release/Runtime/UI/TmpText.meta
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}