Resolved merge conflict using remote version of Sprink_TEST.umap
This commit is contained in:
BIN
hwanyoung2/Content/HandsomeSwordCombatAnims/Animations/Attack/Anim_Sword_1H_Attack_Jump1.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/HandsomeSwordCombatAnims/Animations/Attack/Anim_Sword_1H_Attack_Jump1.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_BossField.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_BossField.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset
(Stored with Git LFS)
Binary file not shown.
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Levels/MA_SpringLevel2.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/Levels/MA_SpringLevel2.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Levels/Sprink_TEST.umap
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/Levels/Sprink_TEST.umap
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/UI/Inventory_HUD/BP_InventoryItemSlot.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/UI/Inventory_HUD/BP_InventoryItemSlot.uasset
(Stored with Git LFS)
Binary file not shown.
Reference in New Issue
Block a user