fix whitespace offset due to merge conflict

This commit is contained in:
Anthony J. Thibault 2015-08-24 14:50:02 -07:00
parent fa5256eefd
commit 9457794d9e

View file

@ -155,7 +155,7 @@ void MyAvatar::reset() {
setOrientation(glm::quat(eulers));
}
void MyAvatar::update(float deltaTime) {
void MyAvatar::update(float deltaTime) {
if (_goToPending) {
setPosition(_goToPosition);