From b2057fcf7b3ce919c67ae06122b99d747e97095f Mon Sep 17 00:00:00 2001
From: KiD Fearless <kidfearless1@gmail.com>
Date: Tue, 16 Jun 2020 21:04:02 -0600
Subject: [PATCH] Fix missed merge conflict

---
 addons/sourcemod/scripting/include/shavit.inc | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/addons/sourcemod/scripting/include/shavit.inc b/addons/sourcemod/scripting/include/shavit.inc
index 8e83bd1e..c153ae89 100644
--- a/addons/sourcemod/scripting/include/shavit.inc
+++ b/addons/sourcemod/scripting/include/shavit.inc
@@ -1760,16 +1760,7 @@ native int Shavit_GetPlayerPreFrame(int client);
  *
  * @noreturn
  */
-native void Shavit_SetPlayerPreFrame(int client, int PreFrame, int TimerPreFrame);
-
-/*
- * Gets player's timer frame 
- *
- * @param client					Client index
- *
- * @return Timer start frame
- */
-native int Shavit_GetPlayerTimerframe(int client);
+native void Shavit_SetPlayerPreFrame(int client, int PreFrame);
 
 /*
  * Sets player's timer preframe length.