修merge错误

This commit is contained in:
2025-07-21 02:34:00 +08:00
parent 7fef90ef64
commit 8af86740a5

View File

@@ -1,11 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>
<<<<<<< Updated upstream
<ThingDef ParentName="BodyPartProstheticMakeableBase">
=======
<ThingDef>
>>>>>>> Stashed changes
<defName>Wula_BackstoryRegeneratorImplant</defName>
<label>backstory regenerator</label>
<thingClass>ThingWithComps</thingClass>