From deda2fa5eb3546a236f9fedd11b81ba6285f1b3d Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Wed, 4 Jan 2023 20:33:18 -0500
Subject: [PATCH] powder that makes you say yes

---
 .../mob/living/silicon/robot/robot_modules/station_vr.dm     | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
index ccb8ae6b6d..a4c69d6d3d 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
@@ -1033,12 +1033,7 @@
 	R.verbs -= /mob/living/silicon/robot/proc/rest_style
 	..()
 
-<<<<<<< HEAD
-/obj/item/weapon/robot_module/robot/booze
-=======
-
 /obj/item/weapon/robot_module/robot/clerical/butler/booze
->>>>>>> a533de71c6... Merge pull request #14269 from Heroman3003/borg-event-stuff
 	name = "BoozeHound robot module"
 	can_be_pushed = 0
 	sprites = list(