From 8af86740a5de8c578a753b876df3530d35709d37 Mon Sep 17 00:00:00 2001
From: "ProjectKoi-Kalo\\Kalo" <kalospacer@gmail.com>
Date: Mon, 21 Jul 2025 02:34:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AEmerge=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 1.6/Defs/HediffDefs/Implants_RegenerateBackstory.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/1.6/Defs/HediffDefs/Implants_RegenerateBackstory.xml b/1.6/Defs/HediffDefs/Implants_RegenerateBackstory.xml
index cacf5ea3..87893fd3 100644
--- a/1.6/Defs/HediffDefs/Implants_RegenerateBackstory.xml
+++ b/1.6/Defs/HediffDefs/Implants_RegenerateBackstory.xml
@@ -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>