fix merge conflicts

2026-06-23 20:38:32 -07:00 · 2026-06-23 20:38:32 -07:00 · 92f7dc5a3b
commit 92f7dc5a3b
parent 8f394e1d92
1 changed files with 0 additions and 4 deletions
--- a/Assets/_Project/Definitions.meta
+++ b/Assets/_Project/Definitions.meta
@ -1,9 +1,5 @@
 fileFormatVersion: 2
-<<<<<<< HEAD
-guid: 01de85ee5d8a2014594d9910b1a6ff55
-=======
 guid: cf294cbfb17f5a5d7846479a116fc7b3
->>>>>>> 31b0b5f (adding uncommited files (oops))
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}