valentine/Min-Client-Datasheets
1
0
Fork 0
forked from TERA_p3104/Client-Datasheets
Code Pull Requests Activity

Fix Post Merge Baldera

Browse Source
This commit is contained in:
Archgeus
2025-03-16 21:42:48 -05:00
parent 89951e164c
commit 31606b0e9e
7 changed files with 38 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DataCenter_Final_EUR/VillagerDialog/VillagerDialog-00110.xml
View File

@@ -1,11 +1,5 @@
<<<<<<< HEAD
<VillagerDialog xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://vezel.dev/novadrop/dc/VillagerDialog VillagerDialog.xsd" id="1005" huntingZoneId="58" voiceTypeId="76" xmlns="https://vezel.dev/novadrop/dc/VillagerDialog">
<Text id="1" huntingZoneId="58" prevId="0" villagerId="1005" endSocial="14">
<Page social="0">What? Why do you think you have a healthy body? Train yourself, Train!</Page>
=======
<VillagerDialog xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://vezel.dev/novadrop/dc/VillagerDialog VillagerDialog.xsd" id="1005" huntingZoneId="58" voiceTypeId="80" xmlns="https://vezel.dev/novadrop/dc/VillagerDialog">
<Text id="1" huntingZoneId="58" prevId="0" villagerId="1005" endSocial="14">
<Page social="4">What? Why do you think you have a healthy body? Train yourself, Train!</Page>
>>>>>>> baldera
</Text>
</VillagerDialog>