Resolve conflict: use remote version of dragon_ult_uncut.uasset

merge and edit level
2025-05-05 20:23:35 +09:00 · 2025-05-05 20:21:27 +09:00
3 changed files with 3 additions and 3 deletions
--- a/hwanyoung2/Content/Hwanyoung/Levels/Sprink_TEST.umap
+++ b/hwanyoung2/Content/Hwanyoung/Levels/Sprink_TEST.umap
--- a/hwanyoung2/Content/Illusions/Assets/dragon_ult_uncut.uasset
+++ b/hwanyoung2/Content/Illusions/Assets/dragon_ult_uncut.uasset
--- a/hwanyoung2/Intermediate/ReimportCache/3688439234.bin
+++ b/hwanyoung2/Intermediate/ReimportCache/3688439234.bin
Author	SHA1	Message	Date
wonjoon	b7a4095ee3	Resolve conflict: use remote version of dragon_ult_uncut.uasset	2025-05-05 20:23:35 +09:00
wonjoon	172659a9c7	merge and edit level	2025-05-05 20:21:27 +09:00