From 89168e2c7dd3d5787eed3a8d88adc75355f5692f Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sun, 12 Dec 2021 04:22:41 -0500
Subject: [PATCH] powder that makes you say yes

---
 code/game/objects/items/robot/robot_upgrades_vr.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/game/objects/items/robot/robot_upgrades_vr.dm b/code/game/objects/items/robot/robot_upgrades_vr.dm
index a0e131a6b6..215a936bda 100644
--- a/code/game/objects/items/robot/robot_upgrades_vr.dm
+++ b/code/game/objects/items/robot/robot_upgrades_vr.dm
@@ -8,11 +8,7 @@
 		R.add_language(LANGUAGE_ENOCHIAN,		1)
 		R.add_language(LANGUAGE_SLAVIC,			1)
 		R.add_language(LANGUAGE_DRUDAKAR, 		1)
-<<<<<<< HEAD
-		R.add_language(LANGUAGE_SQUEAKISH,		1) //CHOMPedit
-=======
 		R.add_language(LANGUAGE_TAVAN,			1)
->>>>>>> 3f701c8c8a... Merge pull request #11821 from Enzo-Leon/altevian-001
 		return 1
 	else
 		return 0