Update anomalies.dm

2017-12-17 15:57:02 -06:00
parent f377aa441f
commit 75ccc3b354
1 changed files with 0 additions and 6 deletions
@@ -26,14 +26,8 @@
 	aSignal = new(src)
 	aSignal.name = "[name] core"
 	aSignal.code = rand(1,100)
-
-<<<<<<< HEAD
-	aSignal.frequency = rand(1200, 1599)
-	if(IsMultiple(aSignal.frequency, 2))//signaller frequencies are always uneven!
-=======
 	aSignal.frequency = rand(MIN_FREE_FREQ, MAX_FREE_FREQ)
 	if(ISMULTIPLE(aSignal.frequency, 2))//signaller frequencies are always uneven!
->>>>>>> 25080ff... defines math (#33498)
 		aSignal.frequency++

 	if(new_lifespan)