Fix git merge
This commit is contained in:
parent
45da7df5a1
commit
87a5538bee
@ -839,9 +839,6 @@ private:
|
||||
void pauseAnimation();
|
||||
void resumeAnimation();
|
||||
|
||||
void pauseAnimation();
|
||||
void resumeAnimation();
|
||||
|
||||
// ClientEvent handlers
|
||||
void handleClientEvent_None(ClientEvent *event, CameraOrientation *cam);
|
||||
void handleClientEvent_PlayerDamage(ClientEvent *event, CameraOrientation *cam);
|
||||
|
Loading…
x
Reference in New Issue
Block a user