Update game.dm

2018-01-21 11:56:09 -06:00
parent f59a365c23
commit c158d2f6dd
1 changed files with 0 additions and 7 deletions
@@ -15,17 +15,10 @@
 	return T ? T.loc : null

 /proc/get_area_name(atom/X, format_text = FALSE)
-<<<<<<< HEAD
-	var/area/Y = get_area(X)
-	if(format_text)
-		return format_text(Y.name)
-	return Y.name
-=======
 	var/area/A = isarea(X) ? X : get_area(X)
 	if(!A)
 		return null
 	return format_text ? format_text(A.name) : A.name
->>>>>>> f46dcd7... honk

 /proc/get_area_by_name(N) //get area by its name
 	for(var/area/A in world)