From b728fd61606c24e939b3051f8787472663d0cc7c Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sat, 30 Sep 2017 01:38:27 -0500
Subject: [PATCH] Update global_lists.dm

---
 code/__HELPERS/global_lists.dm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm
index 75f9fbd3d0..0b79afb941 100644
--- a/code/__HELPERS/global_lists.dm
+++ b/code/__HELPERS/global_lists.dm
@@ -113,4 +113,3 @@
 		for(var/path in subtypesof(prototype))
 			L+= path
 		return L
->>>>>>> 4178c20... Configuration datum refactor (#30763)