From 9b73c83ebc048a8a2c384332c61d777b5558b247 Mon Sep 17 00:00:00 2001
From: amantley <amantley@googlemail.com>
Date: Fri, 22 Feb 2019 11:50:38 -0800
Subject: [PATCH] removed merge markers

(cherry picked from commit 4286142daac70269de155c99c9bbdb1f951eaff6)
---
 .../avatars-renderer/src/avatars-renderer/Avatar.h |  3 ---
 libraries/fbx/src/FBXSerializer.cpp                | 14 --------------
 2 files changed, 17 deletions(-)

diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.h b/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
index 1acee7439f..3d25c275b1 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
@@ -236,7 +236,6 @@ public:
     virtual bool setAbsoluteJointRotationInObjectFrame(int index, const glm::quat& rotation) override { return false; }
     virtual bool setAbsoluteJointTranslationInObjectFrame(int index, const glm::vec3& translation) override { return false; }
 
-<<<<<<< HEAD
     // world-space to avatar-space rigconversion functions
     /**jsdoc
     * @function MyAvatar.worldToJointPoint
@@ -286,10 +285,8 @@ public:
     * @returns {Quat}
     */
     Q_INVOKABLE glm::quat jointToWorldRotation(const glm::quat& rotation, const int jointIndex = -1) const;
-=======
     virtual glm::vec3 getSpine2SplineOffset() const { return _spine2SplineOffset; }
     virtual float getSpine2SplineRatio() const { return _spine2SplineRatio; }
->>>>>>> cache the spine2 spline default offset and ratio
 
     virtual void setSkeletonModelURL(const QUrl& skeletonModelURL) override;
     virtual void setAttachmentData(const QVector<AttachmentData>& attachmentData) override;
diff --git a/libraries/fbx/src/FBXSerializer.cpp b/libraries/fbx/src/FBXSerializer.cpp
index 30bd527546..9e7f422b40 100644
--- a/libraries/fbx/src/FBXSerializer.cpp
+++ b/libraries/fbx/src/FBXSerializer.cpp
@@ -1288,20 +1288,6 @@ HFMModel* FBXSerializer::extractHFMModel(const QVariantHash& mapping, const QStr
         }
         joint.inverseBindRotation = joint.inverseDefaultRotation;
         joint.name = fbxModel.name;
-<<<<<<< HEAD
-=======
-        if (hfmModel.hfmToHifiJointNameMapping.contains(hfmModel.hfmToHifiJointNameMapping.key(joint.name))) {
-            joint.name = hfmModel.hfmToHifiJointNameMapping.key(fbxModel.name);
-        }
-
-        foreach (const QString& childID, _connectionChildMap.values(modelID)) {
-            QString type = typeFlags.value(childID);
-            if (!type.isEmpty()) {
-                hfmModel.hasSkeletonJoints |= (joint.isSkeletonJoint = type.toLower().contains("Skeleton"));
-                break;
-            }
-        }
->>>>>>> implemented the splineIK in animSplineIK.cpp, todo: disable animinversekinematic.cpp
 
         joint.bindTransformFoundInCluster = false;