tried to solve merge conflicts with the thing
This commit is contained in:
@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<objects serializationModel="Studio.02.02.00">
|
||||
<object class="EventFolder" id="{039afa92-b442-4b99-89f5-a9a681e5ab09}">
|
||||
<property name="name">
|
||||
<value>UI</value>
|
||||
</property>
|
||||
<relationship name="folder">
|
||||
<destination>{edd2a6c2-ac8e-4e58-9518-64c404c730dd}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
</objects>
|
@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<objects serializationModel="Studio.02.02.00">
|
||||
<object class="EventFolder" id="{58f76323-7476-4fc2-9d75-933801901ec4}">
|
||||
<property name="name">
|
||||
<value>Combat</value>
|
||||
</property>
|
||||
<relationship name="folder">
|
||||
<destination>{edd2a6c2-ac8e-4e58-9518-64c404c730dd}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
</objects>
|
@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<objects serializationModel="Studio.02.02.00">
|
||||
<object class="EventFolder" id="{840a4408-d248-4537-bba5-0ca37b0211c8}">
|
||||
<property name="name">
|
||||
<value>Sanin</value>
|
||||
</property>
|
||||
<relationship name="folder">
|
||||
<destination>{58f76323-7476-4fc2-9d75-933801901ec4}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
</objects>
|
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<objects serializationModel="Studio.02.02.00">
|
||||
<object class="MasterEventFolder" id="{a43f3731-e8de-4701-b58a-59dfaa4f5473}">
|
||||
<property name="name">
|
||||
<value>Master</value>
|
||||
</property>
|
||||
</object>
|
||||
</objects>
|
@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<objects serializationModel="Studio.02.02.00">
|
||||
<object class="EventFolder" id="{a4e936df-4990-4158-8b8d-22216cbd6ae0}">
|
||||
<property name="name">
|
||||
<value>Buff Sword</value>
|
||||
</property>
|
||||
<relationship name="folder">
|
||||
<destination>{58f76323-7476-4fc2-9d75-933801901ec4}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
</objects>
|
@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<objects serializationModel="Studio.02.02.00">
|
||||
<object class="EventFolder" id="{c17b2701-f854-4202-9c96-2d97e0c77c26}">
|
||||
<property name="name">
|
||||
<value>Music</value>
|
||||
</property>
|
||||
<relationship name="folder">
|
||||
<destination>{a43f3731-e8de-4701-b58a-59dfaa4f5473}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
</objects>
|
@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<objects serializationModel="Studio.02.02.00">
|
||||
<object class="EventFolder" id="{edd2a6c2-ac8e-4e58-9518-64c404c730dd}">
|
||||
<property name="name">
|
||||
<value>SFX</value>
|
||||
</property>
|
||||
<relationship name="folder">
|
||||
<destination>{a43f3731-e8de-4701-b58a-59dfaa4f5473}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
</objects>
|
Reference in New Issue
Block a user