From 6df47bed08747a5614265a8be28f3a2ce16cefcf Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Thu, 9 Nov 2017 03:15:20 -0600
Subject: [PATCH] Update datumvars.dm

---
 code/datums/datumvars.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm
index 25de63a055..7eb6afec5b 100644
--- a/code/datums/datumvars.dm
+++ b/code/datums/datumvars.dm
@@ -53,11 +53,7 @@
 		return
 
 	var/title = ""
-<<<<<<< HEAD
-	var/refid = "\ref[D]"
-=======
 	var/refid = REF(D)
->>>>>>> bd5f864... Fixes VV not displaying false values in keyed lists (#32498)
 	var/icon/sprite
 	var/hash