From 768598b1545b361a3a5f3e312a2d66c2d510f1a3 Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Thu, 23 Sep 2021 12:22:36 -0400
Subject: [PATCH] fix bad merge

---
 include/battle_util.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/battle_util.h b/include/battle_util.h
index d01ca3411d..15b238b17d 100644
--- a/include/battle_util.h
+++ b/include/battle_util.h
@@ -48,7 +48,6 @@ struct TypePower
 extern const struct TypePower gNaturalGiftTable[];
 
 void HandleAction_ThrowBall(void);
-bool32 IsAffectedByFollowMe(u32 battlerAtk, u32 defSide);
 bool32 IsAffectedByFollowMe(u32 battlerAtk, u32 defSide, u32 move);
 void HandleAction_UseMove(void);
 void HandleAction_Switch(void);