mc resolve

Fluffy-Frontier · Dec 3, 2023 · 478d7f0 · 478d7f0
1 parent 3e8ab56
commit 478d7f0
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/tgstation.dme b/tgstation.dme
@@ -4692,16 +4692,7 @@
 #include "code\modules\mob\living\basic\pets\penguin.dm"
 #include "code\modules\mob\living\basic\pets\pet.dm"
 #include "code\modules\mob\living\basic\pets\sloth.dm"
-<<<<<<< HEAD
-=======
-#include "code\modules\mob\living\basic\pets\cat\bread_cat_ai.dm"
-#include "code\modules\mob\living\basic\pets\cat\cat.dm"
-#include "code\modules\mob\living\basic\pets\cat\cat_ai.dm"
 #include "code\modules\mob\living\basic\pets\cat\feral.dm"
-#include "code\modules\mob\living\basic\pets\cat\keeki.dm"
-#include "code\modules\mob\living\basic\pets\cat\kitten_ai.dm"
-#include "code\modules\mob\living\basic\pets\cat\runtime.dm"
->>>>>>> baa336ba6 ([MIRROR] Ports feral cats and feral cat grenades from Hippie [MDB IGNORE] (#25372))
 #include "code\modules\mob\living\basic\pets\dog\_dog.dm"
 #include "code\modules\mob\living\basic\pets\dog\corgi.dm"
 #include "code\modules\mob\living\basic\pets\dog\dog_subtypes.dm"