Update projectile.dm

2018-01-07 15:20:59 -05:00
parent be1fe799db
commit 7f53f7dc08
1 changed files with 0 additions and 3 deletions
@@ -362,10 +362,7 @@
 	if(targloc || !params)
 		yo = targloc.y - curloc.y
 		xo = targloc.x - curloc.x
-<<<<<<< HEAD
-=======
 		setAngle(Get_Angle(src, targloc))
->>>>>>> e1e10ca... Merge pull request #34140 from kevinz000/quickfix-1

 	if(isliving(source) && params)
 		var/list/calculated = calculate_projectile_angle_and_pixel_offsets(source, params)