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:e44fd991be35e86dc731008c9af1f554897085e62856303ab87488b9b1a45711
|
|
=======
|
|
oid sha256:632f0cb12ef0c3400a2ca0b656a623bdda928d157983e26308a38b5e33a5816d
|
|
>>>>>>> dev
|
|
size 7366
|