Update weakrefs.dm

2017-11-14 13:06:53 -06:00
parent 8868a354b6
commit e0d291eb19
1 changed files with 0 additions and 5 deletions
@@ -15,9 +15,4 @@

 /datum/weakref/proc/resolve()
 	var/datum/D = locate(reference)
-<<<<<<< HEAD
-	return D.weak_reference == src? D : null
-=======
 	return (!QDELETED(D) && D.weak_reference == src) ? D : null
-
->>>>>>> bdfbafd... [READY]integrated circuitry port+upgrade. (#32481)