From 84be31bb006bc15128d9232d01b53bfc63636be1 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sun, 28 Jan 2018 15:19:22 -0600
Subject: [PATCH] Update unsorted.dm

---
 code/__HELPERS/unsorted.dm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index 92ed3965e5..aaabbef74b 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -1535,8 +1535,6 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
 		D.vv_edit_var(var_name, var_value)	//same result generally, unless badmemes
 	else
 		D.vars[var_name] = var_value
-<<<<<<< HEAD
-=======
 
 /proc/get_random_food()
 	var/list/blocked = list(/obj/item/reagent_containers/food/snacks,
@@ -1563,4 +1561,3 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
 
 /proc/get_random_drink()
 	return pick(subtypesof(/obj/item/reagent_containers/food/drinks))
->>>>>>> 1a45d35... Merge pull request #34875 from tgstation/Cyberboss-patch-5