Fix missed merge conflict

This commit is contained in:
KiD Fearless 2020-06-16 21:04:02 -06:00
parent 8f0fd02f32
commit b2057fcf7b

View File

@ -1760,16 +1760,7 @@ native int Shavit_GetPlayerPreFrame(int client);
* *
* @noreturn * @noreturn
*/ */
native void Shavit_SetPlayerPreFrame(int client, int PreFrame, int TimerPreFrame); native void Shavit_SetPlayerPreFrame(int client, int PreFrame);
/*
* Gets player's timer frame
*
* @param client Client index
*
* @return Timer start frame
*/
native int Shavit_GetPlayerTimerframe(int client);
/* /*
* Sets player's timer preframe length. * Sets player's timer preframe length.