Clean-up after merge

2019-01-17 02:01:23 +09:00
parent 6fcf0b1a54
commit 0c0a616691
3 changed files with 0 additions and 62 deletions
@@ -54,10 +54,6 @@ private:
    float m_offsetZ = 0.0f;
    int m_rotation = 0;
    int m_tempRotation = 0;
-<<<<<<< HEAD
-=======
-    int m_rotationOld = 0;
->>>>>>> master
    bool m_adjustChaperone = true;
    bool m_rotateHand = false;
    bool m_moveShortcutRightPressed = false;