Update client_procs.dm

2017-12-17 15:57:57 -06:00
parent 28dfbc7ccc
commit 2a7b168e0b
1 changed files with 0 additions and 3 deletions
@@ -673,8 +673,6 @@ GLOBAL_LIST(external_rsc_urls)
 			return TRUE
 	. = ..()

-<<<<<<< HEAD
-=======
 /client/proc/rescale_view(change, min, max)
 	var/viewscale = getviewsize(view)
 	var/x = viewscale[1]
@@ -682,7 +680,6 @@ GLOBAL_LIST(external_rsc_urls)
 	x = CLAMP(x+change, min, max)
 	y = CLAMP(y+change, min,max)
 	change_view("[x]x[y]")
->>>>>>> 25080ff... defines math (#33498)

 /client/proc/change_view(new_size)
 	if (isnull(new_size))