From 2076056307cf85b6d5504cdc59fb93e400f4f1ae Mon Sep 17 00:00:00 2001
From: killerwife <killerwife@gmail.com>
Date: Wed, 13 Nov 2024 09:36:41 +0100
Subject: [PATCH] Fix merge error

---
 src/game/Entities/Creature.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/game/Entities/Creature.cpp b/src/game/Entities/Creature.cpp
index 11faa630a6..5576f06895 100644
--- a/src/game/Entities/Creature.cpp
+++ b/src/game/Entities/Creature.cpp
@@ -2152,7 +2152,7 @@ bool Creature::IsVisibleInGridForPlayer(Player* pl) const
     return false;
 }
 
-void Creature::CallAssistance(Unit* enemy)
+void Creature::CallAssistance()
 {
     CallAssistance(GetVictim());
 }
@@ -2189,11 +2189,6 @@ void Creature::CallForHelp(float radius)
     Cell::VisitGridObjects(this, worker, radius);
 }
 
-void Creature::CallAssistance()
-{
-    CallAssistance(GetVictim());
-}
-
 /// if enemy provided, check for initial combat help against enemy
 bool Creature::CanAssistTo(const Unit* u, const Unit* enemy, bool checkfaction /*= true*/) const
 {