From 28dcf82cca280c74019d841e91f6378bae20174f Mon Sep 17 00:00:00 2001
From: benroshio <148654002+benroshio@users.noreply.github.com>
Date: Mon, 7 Apr 2025 23:04:18 -0400
Subject: [PATCH] Auto stash before merge of "Shiori" and "main"

---
 .../Content/Hwanyoung/Character/NPC/BP_AggroNPCBase.uasset  | 6 +++---
 .../PlayerCharacter/Playables/Haesol/BP_Haesol.uasset       | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_AggroNPCBase.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_AggroNPCBase.uasset
index c2f271a6..89d5510c 100644
--- a/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_AggroNPCBase.uasset
+++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_AggroNPCBase.uasset
@@ -1,3 +1,3 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:86943ab62f565a43ecdec981d9fdb7bed06b318b0cb9f39060d5cf8255611309
-size 646368
+version https://git-lfs.github.com/spec/v1
+oid sha256:86943ab62f565a43ecdec981d9fdb7bed06b318b0cb9f39060d5cf8255611309
+size 646368
diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset
index 5049372b..0a7c77f4 100644
--- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset
+++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset
@@ -1,3 +1,3 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4e94135fe2c8bfcf7464c570d090be21d7a79122164cb88da4c20276ea604bad
-size 1487820
+version https://git-lfs.github.com/spec/v1
+oid sha256:4e94135fe2c8bfcf7464c570d090be21d7a79122164cb88da4c20276ea604bad
+size 1487820