From cdc8abcbb90744b304c601e03126e918c6e7abc4 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sun, 3 Jan 2021 21:38:36 -0500
Subject: [PATCH] Update misc.dm

---
 code/game/objects/random/misc.dm | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm
index 70de9ba6ef..ae38e622ab 100644
--- a/code/game/objects/random/misc.dm
+++ b/code/game/objects/random/misc.dm
@@ -673,14 +673,8 @@
 				/obj/item/toy/plushie/borgplushie/scrubpuppy,
 				/obj/item/toy/plushie/foxbear,
 				/obj/item/toy/plushie/nukeplushie,
-<<<<<<< HEAD
 				/obj/item/toy/plushie/otter,
-||||||| parent of f98b1e125e... Merge pull request #9520 from Novacat/nova-basicfixes
-				/obj/item/toy/plushie/otter)
-=======
-				/obj/item/toy/plushie/otter,
-				/obj/item/toy/plushie/vox)
->>>>>>> f98b1e125e... Merge pull request #9520 from Novacat/nova-basicfixes
+				/obj/item/toy/plushie/vox,
 				//VOREStation Add End
 				//YawnWider Add Start
 				/obj/item/toy/plushie/teshari/_yw,