From 6ed7f455b7323e5a8bfd98990034279bfe1f2403 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Thu, 12 Oct 2017 02:54:26 -0500
Subject: [PATCH] Update modifyvariables.dm

---
 code/modules/admin/verbs/modifyvariables.dm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/code/modules/admin/verbs/modifyvariables.dm b/code/modules/admin/verbs/modifyvariables.dm
index b708e42b3c..9edf84800d 100644
--- a/code/modules/admin/verbs/modifyvariables.dm
+++ b/code/modules/admin/verbs/modifyvariables.dm
@@ -437,14 +437,9 @@ GLOBAL_PROTECT(VVpixelmovement)
 
 	if(default == VV_NUM)
 		var/dir_text = ""
-<<<<<<< HEAD
-		if(dir < 0 && dir < 16)
-			if(dir & 1)
-=======
 		var/tdir = variable
 		if(tdir > 0 && tdir < 16)
 			if(tdir & 1)
->>>>>>> 428922c... Fixes VVing associated values in lists when the value was a number. (#31511)
 				dir_text += "NORTH"
 			if(dir & 2)
 				dir_text += "SOUTH"