1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-28 20:27:46 +00:00

merge failed

This commit is contained in:
collett 2020-01-14 23:48:40 +09:00
parent 0513025b6a
commit 5867224baf

View file

@ -129,8 +129,6 @@ namespace Sapphire::World::Action
ActionEntry getActionEntry() const;
float getAnimationLock();
float getAnimationLock();
bool isPhysical() const;
bool isMagical() const;