resolving conflict

2026-05-17 20:15:06 +02:00
parent d7211e62de 28a81b6014
commit b0945c9bdb
771 changed files with 276633 additions and 10431 deletions
--- a/Assets/TextMesh
+++ b/Assets/TextMesh
@@ -1,5 +1,13 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: f54d1bd14bd3ca042bd867b519fee8cc
+=======
+<<<<<<< HEAD
+guid: 21a35dfbccf309e49b306ffd4823cb2e
+=======
+guid: f54d1bd14bd3ca042bd867b519fee8cc
+>>>>>>> a0a675676d59d3c1e8b18f9ccca83d8e4713519c
+>>>>>>> origin/main
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}