From b95cdecb89af78315a8b5978d186732a9069bdf7 Mon Sep 17 00:00:00 2001 From: HugoLuman Date: Tue, 12 Apr 2016 19:26:34 -0700 Subject: [PATCH] Fixes merge conflict Signed-off-by: HugoLuman --- code/modules/surgery/organs/subtypes/drask.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/surgery/organs/subtypes/drask.dm b/code/modules/surgery/organs/subtypes/drask.dm index f0db8c7878e..c5dd8d98d41 100644 --- a/code/modules/surgery/organs/subtypes/drask.dm +++ b/code/modules/surgery/organs/subtypes/drask.dm @@ -3,11 +3,7 @@ name = "drask organ" icon = 'icons/obj/surgery_drask.dmi' icon_state = "innards" -<<<<<<< HEAD desc = "A greenish, slightly translucent organ. It is extremely cold." -======= - desc = "A greenish, slightly translucent organ. /red It is extremely cold." ->>>>>>> 46bd72ac5e61af45f173d2c705563ed10b898819 /obj/item/organ/internal/heart/drask name = "drask heart"