Resolve Merge conflicts

This commit is contained in:
Vegapnk 2023-02-05 09:38:53 +01:00
commit bf5617ffe0
35 changed files with 641 additions and 123 deletions

View file

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8" ?>
<Patch>
<Operation Class="PatchOperationFindMod">
<mods>
<li>LustLicentia.RJWLabs</li>
</mods>
<match Class="PatchOperationAdd">
<xpath>Defs/XenotypeDef[defName="rjw_genes_succubus"]/genes</xpath>
<value>
<li>rjw_genes_elasticity</li>
</value>
</match>
</Operation>
</Patch>