neroberovero/Illusion-UE5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
benroshio
2025-05-11 23:09:24 -04:00
parent 59f77cbcc9 9329fd919b
commit caf0c47745
71 changed files with 298 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hwanyoung2/Content/Illusions/.unsaved/.user/Metadata/Workspace.user.xml
View File

@ -13,11 +13,15 @@
<value>Event Editor 1</value>
</property>
<property name="windowLayout">
<<<<<<< HEAD
<<<<<<< Updated upstream
<value>AAAAAwAAAA4ATQBpAHgAZQByACAAMgAAAEIB2dDLAAMAAP//+H8AAAACAAAAAAAABBr///tSAAABaP///98AAAUnAAAAAQIAAAAHgP//+IAAAAAh/////wAABBkAAAAOAE0AaQB4AGUAcgAgADEAAABCAdnQywADAAAAAAIK////9wAABpkAAAPUAAACCwAAABQAAAaYAAAD0wAAAAAAAAAACgAAAAILAAAAFAAABpgAAAPTAAAAHABFAHYAZQBuAHQAIABFAGQAaQB0AG8AcgAgADEAAABCAdnQywADAAAAAAO/AAABEgAACcYAAAVAAAADwAAAAS8AAAnFAAAFPwAAAAAAAAAACgAAAAPAAAABLwAACcUAAAU/</value>
=======
<value>AAAAAwAAAA4ATQBpAHgAZQByACAAMgAAAEIB2dDLAAMAAP//+H8AAAACAAAAAAAABBr///tSAAABaP///98AAAUnAAAAAQIAAAAHgP//+IAAAAAh/////wAABBkAAAAOAE0AaQB4AGUAcgAgADEAAABCAdnQywADAAD/////////+AAACgAAAAV4AAACCwAAABMAAAaYAAAD0gAAAAACAAAACgAAAAAAAAAAFwAACf8AAAV3AAAAHABFAHYAZQBuAHQAIABFAGQAaQB0AG8AcgAgADEAAABCAdnQywADAAD/////////+AAACgAAAAV4AAAB4gAABEgAAAYBAAAHNgAAAAACAAAACgAAAAAAAAAAFwAACf8AAAV3</value>
>>>>>>> Stashed changes
=======
<value>AAAAAwAAAA4ATQBpAHgAZQByACAAMgAAAEIB2dDLAAMAAP//+H8AAAACAAAAAAAABBr///tSAAABaP///98AAAUnAAAAAQIAAAAHgP//+IAAAAAh/////wAABBkAAAAOAE0AaQB4AGUAcgAgADEAAABCAdnQywADAAAAAAIK////9wAABpkAAAPUAAACCwAAABQAAAaYAAAD0wAAAAAAAAAACgAAAAILAAAAFAAABpgAAAPTAAAAHABFAHYAZQBuAHQAIABFAGQAaQB0AG8AcgAgADEAAABCAdnQywADAAAAAAPeAAAA0AAACeUAAAT+AAAD3wAAAO0AAAnkAAAE/QAAAAAAAAAACgAAAAPfAAAA7QAACeQAAAT9</value>
>>>>>>> origin/main
</property>
<relationship name="activePlatform">
<destination>{44345994-b449-453f-9198-e8f3accd1e71}</destination>