Update login.dm

2017-12-06 13:25:39 -05:00
parent a59207aa84
commit b1852a8c1f
1 changed files with 1 additions and 3 deletions
@@ -33,16 +33,14 @@

 	sync_mind()

-<<<<<<< HEAD
 	client.sethotkeys() //set mob specific hotkeys
-=======
+
 	//Reload alternate appearances
 	for(var/v in GLOB.active_alternate_appearances)
 		if(!v)
 			continue
 		var/datum/atom_hud/alternate_appearance/AA = v
 		AA.onNewMob(src)
->>>>>>> 550d711... Brain Traumas (#31727)

 	update_client_colour()
 	if(client)