Update login.dm

2017-09-23 13:52:29 -05:00
parent 894673ef97
commit cddcd82840
1 changed files with 0 additions and 11 deletions
--- a/code/modules/mob/living/silicon/robot/login.dm
+++ b/code/modules/mob/living/silicon/robot/login.dm
@@ -1,15 +1,4 @@
-<<<<<<< HEAD
-
-/mob/living/silicon/robot/Login()
-	..()
-	regenerate_icons()
-	show_laws(0)
-	if(mind)
-		SSticker.mode.remove_revolutionary(mind)
-=======
-
 /mob/living/silicon/robot/Login()
 	..()
 	regenerate_icons()
 	show_laws(0)
->>>>>>> 0407dcf... Fixes revolutionary deconversion messages and logging (#30956)