qsxft258@gmail.com
302b2959ce
# Conflicts: # Assets/ResourcesData/Background/[첸나]방송용 방/Scene/[첸나]방송용 방.unity
9 lines
264 B (Stored with Git LFS)
Plaintext
9 lines
264 B (Stored with Git LFS)
Plaintext
version https://git-lfs.github.com/spec/v1
|
|
<<<<<<< HEAD
|
|
oid sha256:b62dae084c73bfb8e3fc0d30e2063c488ebeab6575e0fc80064f1bd316457d23
|
|
size 217165
|
|
=======
|
|
oid sha256:8894a235d96bfc9642dda2921fe97ef53d81e857bbcdd009cbcfc4afdfe2490a
|
|
size 232829
|
|
>>>>>>> unity-versionup
|