Update plushes.dm

2017-12-03 06:14:14 -06:00
parent 7be54897b2
commit dd99e8305a
1 changed files with 0 additions and 4 deletions
@@ -503,9 +503,5 @@
 	icon_state = "plushie_slime"
 	item_state = "plushie_slime"
 	attack_verb = list("blorbled", "slimed", "absorbed")
-<<<<<<< HEAD
-	squeak_override = list('sound/effects/blobattack.ogg' = 1)
-=======
 	squeak_override = list('sound/effects/blobattack.ogg' = 1)
 	gender = FEMALE	//given all the jokes and drawings, I'm not sure the xenobiologists would make a slimeboy
->>>>>>> 502905f... Plushie relationships! (#33184)