From 981fa2febb7572055bb0ccd6f36f57c5b0d0ee31 Mon Sep 17 00:00:00 2001
From: Rykka <sorren15@gmail.com>
Date: Sat, 31 Aug 2019 06:32:58 -0600
Subject: [PATCH] Fixed Gitkraken Error. Oops </3

---
 code/modules/mob/living/silicon/pai/pai.dm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index 71f415722c..b6d4052a5f 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -35,13 +35,8 @@
 		"Fox" = "pai-fox",
 		"Parrot" = "pai-parrot",
 		"Rabbit" = "pai-rabbit",
-<<<<<<< Updated upstream
-		"Bear" = "pai-bear"  //VOREStation Edit
-		"Fennec" = "pai-fennec" // VOREStation Edit - Rykka
-=======
 		"Bear" = "pai-bear",  //VOREStation Edit
 		"Fennec" = "pai-fen" // VOREStation Edit - Rykka
->>>>>>> Stashed changes
 		)
 
 	var/global/list/possible_say_verbs = list(