修merge错误
This commit is contained in:
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user