From dbfa7c10c23aec0a8680b71bda49fe58c86a70ec Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Sat, 15 Sep 2012 15:28:15 +0200 Subject: [PATCH] Resolved conflict (missed earlier). --- source/abstract/Physical.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/source/abstract/Physical.cpp b/source/abstract/Physical.cpp index f285c10..9dc65e1 100755 --- a/source/abstract/Physical.cpp +++ b/source/abstract/Physical.cpp @@ -98,12 +98,8 @@ Physical::getSpeed() const { return vector(mBody->GetLinearVelocity()); } -/** -<<<<<<< HEAD - * Returns the rotation of the body as an SFML angle. -======= - * Returns the rotation of the body (converted to an SFML angle). ->>>>>>> origin/master +/** + * Returns the rotation of the body (converted to an SFML angle). */ float Physical::getAngle() const {