From 59f77cbcc985971a575114d768b433e90de0c477 Mon Sep 17 00:00:00 2001
From: benroshio <148654002+benroshio@users.noreply.github.com>
Date: Sat, 10 May 2025 23:50:26 -0400
Subject: [PATCH] Auto stash before merge of "main" and "origin/main"

---
 .../Illusions/.unsaved/.user/Metadata/Workspace.user.xml      | 4 ++++
 .../Content/Illusions/.user/Metadata/Workspace.user.xml       | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/hwanyoung2/Content/Illusions/.unsaved/.user/Metadata/Workspace.user.xml b/hwanyoung2/Content/Illusions/.unsaved/.user/Metadata/Workspace.user.xml
index 65f461d1..0b31d618 100644
--- a/hwanyoung2/Content/Illusions/.unsaved/.user/Metadata/Workspace.user.xml
+++ b/hwanyoung2/Content/Illusions/.unsaved/.user/Metadata/Workspace.user.xml
@@ -13,7 +13,11 @@
 			<value>Event Editor 1</value>
 		</property>
 		<property name="windowLayout">
+<<<<<<< Updated upstream
 			<value>AAAAAwAAAA4ATQBpAHgAZQByACAAMgAAAEIB2dDLAAMAAP//+H8AAAACAAAAAAAABBr///tSAAABaP///98AAAUnAAAAAQIAAAAHgP//+IAAAAAh/////wAABBkAAAAOAE0AaQB4AGUAcgAgADEAAABCAdnQywADAAAAAAIK////9wAABpkAAAPUAAACCwAAABQAAAaYAAAD0wAAAAAAAAAACgAAAAILAAAAFAAABpgAAAPTAAAAHABFAHYAZQBuAHQAIABFAGQAaQB0AG8AcgAgADEAAABCAdnQywADAAAAAAO/AAABEgAACcYAAAVAAAADwAAAAS8AAAnFAAAFPwAAAAAAAAAACgAAAAPAAAABLwAACcUAAAU/</value>
+=======
+			<value>AAAAAwAAAA4ATQBpAHgAZQByACAAMgAAAEIB2dDLAAMAAP//+H8AAAACAAAAAAAABBr///tSAAABaP///98AAAUnAAAAAQIAAAAHgP//+IAAAAAh/////wAABBkAAAAOAE0AaQB4AGUAcgAgADEAAABCAdnQywADAAD/////////+AAACgAAAAV4AAACCwAAABMAAAaYAAAD0gAAAAACAAAACgAAAAAAAAAAFwAACf8AAAV3AAAAHABFAHYAZQBuAHQAIABFAGQAaQB0AG8AcgAgADEAAABCAdnQywADAAD/////////+AAACgAAAAV4AAAB4gAABEgAAAYBAAAHNgAAAAACAAAACgAAAAAAAAAAFwAACf8AAAV3</value>
+>>>>>>> Stashed changes
 		</property>
 		<relationship name="activePlatform">
 			<destination>{44345994-b449-453f-9198-e8f3accd1e71}</destination>
diff --git a/hwanyoung2/Content/Illusions/.user/Metadata/Workspace.user.xml b/hwanyoung2/Content/Illusions/.user/Metadata/Workspace.user.xml
index 65f461d1..0b31d618 100644
--- a/hwanyoung2/Content/Illusions/.user/Metadata/Workspace.user.xml
+++ b/hwanyoung2/Content/Illusions/.user/Metadata/Workspace.user.xml
@@ -13,7 +13,11 @@
 			<value>Event Editor 1</value>
 		</property>
 		<property name="windowLayout">
+<<<<<<< Updated upstream
 			<value>AAAAAwAAAA4ATQBpAHgAZQByACAAMgAAAEIB2dDLAAMAAP//+H8AAAACAAAAAAAABBr///tSAAABaP///98AAAUnAAAAAQIAAAAHgP//+IAAAAAh/////wAABBkAAAAOAE0AaQB4AGUAcgAgADEAAABCAdnQywADAAAAAAIK////9wAABpkAAAPUAAACCwAAABQAAAaYAAAD0wAAAAAAAAAACgAAAAILAAAAFAAABpgAAAPTAAAAHABFAHYAZQBuAHQAIABFAGQAaQB0AG8AcgAgADEAAABCAdnQywADAAAAAAO/AAABEgAACcYAAAVAAAADwAAAAS8AAAnFAAAFPwAAAAAAAAAACgAAAAPAAAABLwAACcUAAAU/</value>
+=======
+			<value>AAAAAwAAAA4ATQBpAHgAZQByACAAMgAAAEIB2dDLAAMAAP//+H8AAAACAAAAAAAABBr///tSAAABaP///98AAAUnAAAAAQIAAAAHgP//+IAAAAAh/////wAABBkAAAAOAE0AaQB4AGUAcgAgADEAAABCAdnQywADAAD/////////+AAACgAAAAV4AAACCwAAABMAAAaYAAAD0gAAAAACAAAACgAAAAAAAAAAFwAACf8AAAV3AAAAHABFAHYAZQBuAHQAIABFAGQAaQB0AG8AcgAgADEAAABCAdnQywADAAD/////////+AAACgAAAAV4AAAB4gAABEgAAAYBAAAHNgAAAAACAAAACgAAAAAAAAAAFwAACf8AAAV3</value>
+>>>>>>> Stashed changes
 		</property>
 		<relationship name="activePlatform">
 			<destination>{44345994-b449-453f-9198-e8f3accd1e71}</destination>