Why aren't my files committing fully...

This commit is contained in:
Sally Coolatta 2020-08-10 12:01:51 -04:00
parent 3b34b3230c
commit 2581ab4bf1

View file

@ -641,11 +641,8 @@ void CL_AddSplitscreenPlayer(void);
void CL_RemoveSplitscreenPlayer(UINT8 p);
void CL_Reset(void);
void CL_ClearPlayer(INT32 playernum);
<<<<<<< HEAD
void CL_RemovePlayer(INT32 playernum, INT32 reason);
=======
void CL_QueryServerList(msg_server_t *list);
>>>>>>> srb2/next
void CL_UpdateServerList(boolean internetsearch, INT32 room);
// Is there a game running
boolean Playing(void);