e3d3061843
# Conflicts: # Content/Assets/Characters/Merchant/AMerchant.uasset # Content/Blueprints/Combat_UI/CombatCharacter.uasset # Content/Blueprints/Items/BP_BuffJelly.uasset # Content/Blueprints/Items/BP_HealingJelly.uasset # Content/Blueprints/Items/ItemsInWorld/BP_BuffPlacedItem.uasset # Content/Blueprints/Items/ItemsInWorld/BP_HealingJellyItem.uasset # Content/Blueprints/Quests/Quest_SistersPendant.uasset # Content/Blueprints/Quests/Quest_SistersPendant_PT2.uasset # Content/Dialogue/SM_Merchant_Blueprint.uasset
8 lines
238 B (Stored with Git LFS)
Plaintext
8 lines
238 B (Stored with Git LFS)
Plaintext
version https://git-lfs.github.com/spec/v1
|
|
<<<<<<< HEAD
|
|
oid sha256:269dfc79171369a42f5ecb2985027713bf65b305eab11b4024c5eb61105ac9b5
|
|
=======
|
|
oid sha256:1b96c55419a131c33480847add7ef56724d7e322627efbf2f35b1035cd98e4ca
|
|
>>>>>>> dev
|
|
size 7395
|