Update disease_outbreak.dm

2017-12-30 13:32:46 -06:00
parent 2fe40198a2
commit f698fd5329
1 changed files with 0 additions and 4 deletions
@@ -33,11 +33,7 @@
 		var/turf/T = get_turf(H)
 		if(!T)
 			continue
-<<<<<<< HEAD
-		if(T.z != ZLEVEL_STATION_PRIMARY)
-=======
 		if(!is_station_level(T.z))
->>>>>>> f2dbe5c... Replace explicit z-level checks with defines (#33829)
 			continue
 		if(!H.client)
 			continue