Revert "Merge branch 'main' into fmod-co"
This reverts commita42441f427
, reversing changes made toaac996d671
.
This commit is contained in:
@ -13,7 +13,11 @@
|
||||
<value>Event Editor 1</value>
|
||||
</property>
|
||||
<property name="windowLayout">
|
||||
<<<<<<< HEAD
|
||||
<value>AAAACQAAABQAUAByAG8AZgBpAGwAZQByACAAMQAAAEIB2dDLAAMAAP/////////4AAAKAAAABXgAAAMOAAABpQAABy0AAATVAAAAAAIAAAAKAAAAAAAAAAAXAAAJ/wAABXcAAAAgAFAAcgBlAHMAZQB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAAAAAzHAAADIAAADlgAAAYPAAAMyAAAAz8AAA5XAAAGDgAAAAEAAAAACgAAAAzIAAADPwAADlcAAAYOAAAAHgBNAGkAeABlAHIAIABSAG8AdQB0AGkAbgBnACAAMQAAAEIB2dDLAAMAAAAABDcAAAE1AAAFyAAABCQAAAQ4AAABVAAABccAAAQjAAAAAAAAAAAKAAAABDgAAAFUAAAFxwAABCMAAAAOAE0AaQB4AGUAcgAgADIAAABCAdnQywADAAAAAAI+AAABHgAABs0AAAT9AAACPwAAAT0AAAbMAAAE/AAAAAAAAAAACgAAAAI/AAABPQAABswAAAT8AAAADgBNAGkAeABlAHIAIAAxAAAAQgHZ0MsAAwAA//////////gAAAoAAAAFeAAAA+sAAAGgAAAIeAAABG8AAAAAAgAAAAoAAAAAAAAAABcAAAn/AAAFdwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAyAAAAQgHZ0MsAAwAA//////////gAAAeAAAAEEAAAAicAAAEoAAAGRgAAAssAAAAAAgAAAAeAAAAAAAAAABcAAAd/AAAEDwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAxAAAAQgHZ0MsAAwAAAAACKQAAAHIAAAmdAAAE/wAAAioAAACPAAAJnAAABP4AAAAAAAAAAAoAAAACKgAAAI8AAAmcAAAE/gAAAB4ARQB2AGUAbgB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAD///t4AAAAgf///QkAAANw///7eQAAAKD///0IAAADbwAAAAEAAAAAB4D///t5AAAAoP///QgAAANvAAAAFgBBAHUAZABpAG8AIABCAGkAbgAgADEAAABCAdnQywADAAAAAAQ3AAABNQAABcgAAAQkAAAEOAAAAVQAAAXHAAAEIwAAAAAAAAAACgAAAAQ4AAABVAAABccAAAQj</value>
|
||||
=======
|
||||
<value>AAAACQAAABQAUAByAG8AZgBpAGwAZQByACAAMQAAAEIB2dDLAAMAAP/////////4AAAKAAAABXgAAAMOAAABpQAABy0AAATVAAAAAAIAAAAKAAAAAAAAAAAXAAAJ/wAABXcAAAAgAFAAcgBlAHMAZQB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAAAAAzHAAADIAAADlgAAAYPAAAMyAAAAz8AAA5XAAAGDgAAAAEAAAAACgAAAAzIAAADPwAADlcAAAYOAAAAHgBNAGkAeABlAHIAIABSAG8AdQB0AGkAbgBnACAAMQAAAEIB2dDLAAMAAAAABDcAAAE1AAAFyAAABCQAAAQ4AAABVAAABccAAAQjAAAAAAAAAAAKAAAABDgAAAFUAAAFxwAABCMAAAAOAE0AaQB4AGUAcgAgADIAAABCAdnQywADAAAAAAI+AAABHgAABs0AAAT9AAACPwAAAT0AAAbMAAAE/AAAAAAAAAAACgAAAAI/AAABPQAABswAAAT8AAAADgBNAGkAeABlAHIAIAAxAAAAQgHZ0MsAAwAAAAAAhQAAAaEAAAUUAAAEkAAAAIYAAAHAAAAFEwAABI8AAAAAAAAAAAoAAAAAhgAAAcAAAAUTAAAEjwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAyAAAAQgHZ0MsAAwAA//////////gAAAeAAAAEEAAAAicAAAEoAAAGRgAAAssAAAAAAgAAAAeAAAAAAAAAABcAAAd/AAAEDwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAxAAAAQgHZ0MsAAwAAAAAAAAAAAAAAAAT/AAAFdwAAAAEAAAAfAAAE/gAABXYAAAAAAAAAAAoAAAAAAQAAAB8AAAT+AAAFdgAAAB4ARQB2AGUAbgB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAD///t4AAAAgf///QkAAANw///7eQAAAKD///0IAAADbwAAAAEAAAAAB4D///t5AAAAoP///QgAAANvAAAAFgBBAHUAZABpAG8AIABCAGkAbgAgADEAAABCAdnQywADAAAAAAQ3AAABNQAABcgAAAQkAAAEOAAAAVQAAAXHAAAEIwAAAAAAAAAACgAAAAQ4AAABVAAABccAAAQj</value>
|
||||
>>>>>>> origin/Shiori
|
||||
</property>
|
||||
<relationship name="activePlatform">
|
||||
<destination>{44345994-b449-453f-9198-e8f3accd1e71}</destination>
|
||||
|
Reference in New Issue
Block a user