From 9457794d9e73082bf1fcfc4d1574851ce7852f33 Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <tony@highfidelity.io>
Date: Mon, 24 Aug 2015 14:50:02 -0700
Subject: [PATCH] fix whitespace offset due to merge conflict

---
 interface/src/avatar/MyAvatar.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 1ee3a3beff..1e296c1066 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -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);