AzureAbyss/Content/Blueprints/Quests/Quest_SistersPendant_PT2.uasset

version https://git-lfs.github.com/spec/v1
oid sha256:0ba4197e7ee79190b0398f1479b120a497f28f64ce7b6470901a4c4c13b73591
size 238
Updated Merchant for Pendant Quest & Attempted to Replace Open Dialogue 2023-05-11 07:52:30 +00:00			`version https://git-lfs.github.com/spec/v1`
Merge branch 'dev' into inventory-ui-overhaul # 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 2023-05-13 16:15:48 +00:00			`oid sha256:0ba4197e7ee79190b0398f1479b120a497f28f64ce7b6470901a4c4c13b73591`
			`size 238`