fix merge conflicts

TreasureProject · Oct 23, 2024 · 168e37e · 168e37e
1 parent 37ee773
commit 168e37e
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/Assets/Treasure/Plugins.meta b/Assets/Treasure/Plugins.meta
diff --git a/Assets/Treasure/TDK/Runtime/Connect/Modals/TransitionModal.cs.meta b/Assets/Treasure/TDK/Runtime/Connect/Modals/TransitionModal.cs.meta