Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation

업데
2026-08-03 09:29:26 +09:00 · 2026-08-03 09:25:47 +09:00 · 2026-07-29 14:39:06 +09:00 · 2026-07-29 14:39:00 +09:00 · 2026-07-29 09:42:51 +09:00
2 changed files with 2 additions and 6 deletions
--- a/Assets/01_Scenes/Hischool_Chapter4/Festival_Test
+++ b/Assets/01_Scenes/Hischool_Chapter4/Festival_Test
@@ -1,9 +1,5 @@
 fileFormatVersion: 2
-<<<<<<< HEAD
-guid: a8c1175d9dd2ba043adc1bc21fbdbca2
-=======
 guid: e9e78b91c05cab0489dbab9e03d63030
->>>>>>> 3558b85ce3191974e6667a9cdf637b53a374c388
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 0
--- a/Assets/XR/Settings/OpenXR
+++ b/Assets/XR/Settings/OpenXR
Author	SHA1	Message	Date
rainylinjing-reboot	2a95ab5a25	Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation	2026-08-03 09:29:26 +09:00
rainylinjing-reboot	4b31c58854	업데	2026-08-03 09:25:47 +09:00
rainylinjing-reboot	f58e912846	Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation	2026-07-29 14:39:06 +09:00
rainylinjing-reboot	c5af07a951	Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation	2026-07-29 14:39:00 +09:00
rainylinjing-reboot	5baee0bcf3	수정안했음	2026-07-29 09:42:51 +09:00