From caf6a77baf15c8f6cacd420ef5c273f651b8b093 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Tue, 18 Apr 2017 16:35:32 -0700
Subject: [PATCH] repair bad merge during rebase

---
 interface/src/FancyCamera.h   | 2 ++
 interface/src/avatar/Avatar.h | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/interface/src/FancyCamera.h b/interface/src/FancyCamera.h
index 9ffa6cafd8..66f7a07dbd 100644
--- a/interface/src/FancyCamera.h
+++ b/interface/src/FancyCamera.h
@@ -13,6 +13,8 @@
 
 #include "Camera.h"
 
+#include <EntityTypes.h>
+
 class FancyCamera : public Camera {
     Q_OBJECT
 
diff --git a/interface/src/avatar/Avatar.h b/interface/src/avatar/Avatar.h
index 17b5ea926e..e777460ecb 100644
--- a/interface/src/avatar/Avatar.h
+++ b/interface/src/avatar/Avatar.h
@@ -336,7 +336,6 @@ protected:
     RateCounter<> _skeletonModelSimulationRate;
     RateCounter<> _jointDataSimulationRate;
 
-<<<<<<< 4318cce04a59543d80a9364c86aab79408dcb50e
     // Smoothing data for blending from one position/orientation to another on remote agents.
     float _smoothPositionTime;
     float _smoothPositionTimer;
@@ -347,8 +346,6 @@ protected:
     glm::quat _smoothOrientationInitial;
     glm::quat _smoothOrientationTarget;
 
-=======
->>>>>>> remove Menu dependency from Avatar class
 private:
     class AvatarEntityDataHash {
     public: