From 5867224baf817fd27ca5fb84d623396c5e3a83ad Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Tue, 14 Jan 2020 23:48:40 +0900
Subject: [PATCH] merge failed

---
 src/world/Action/Action.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/world/Action/Action.h b/src/world/Action/Action.h
index ff8e0bcc..9480e688 100644
--- a/src/world/Action/Action.h
+++ b/src/world/Action/Action.h
@@ -129,8 +129,6 @@ namespace Sapphire::World::Action
     ActionEntry getActionEntry() const;
     float getAnimationLock();
 
-    float getAnimationLock();
-
     bool isPhysical() const;
     bool isMagical() const;