Update client_defines.dm

2017-12-19 15:36:07 -06:00
parent 7d193a5303
commit 5ed003a0f5
1 changed files with 0 additions and 3 deletions
@@ -68,9 +68,6 @@

 	var/datum/chatOutput/chatOutput

-<<<<<<< HEAD
-=======
 	var/list/credits //lazy list of all credit object bound to this client

 	var/datum/player_details/player_details //these persist between logins/logouts during the same round.
->>>>>>> 3d81385... Roundend report refactor (#33246)