Update global_lists.dm

2017-09-30 01:38:27 -05:00
parent 8048ce1842
commit b728fd6160
1 changed files with 0 additions and 1 deletions
@@ -113,4 +113,3 @@
 		for(var/path in subtypesof(prototype))
 			L+= path
 		return L
->>>>>>> 4178c20... Configuration datum refactor (#30763)