From 5ed003a0f5c80bafe74db8b1746e559ea4f31e00 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 19 Dec 2017 15:36:07 -0600 Subject: [PATCH] Update client_defines.dm --- code/modules/client/client_defines.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/client/client_defines.dm b/code/modules/client/client_defines.dm index a7e3b20e7a..10d3866672 100644 --- a/code/modules/client/client_defines.dm +++ b/code/modules/client/client_defines.dm @@ -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)