From 7b9f4a66de85c55e6457630ea96f4612319c7015 Mon Sep 17 00:00:00 2001
From: haroonq <29288912+haroonq@users.noreply.github.com>
Date: Mon, 29 Oct 2018 14:52:41 -0700
Subject: [PATCH] Update glTF2Exporter.cpp

---
 code/glTF2Exporter.cpp | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/code/glTF2Exporter.cpp b/code/glTF2Exporter.cpp
index b9d145743..83aae5136 100644
--- a/code/glTF2Exporter.cpp
+++ b/code/glTF2Exporter.cpp
@@ -973,14 +973,9 @@ inline void ExtractTranslationSampler(Asset& asset, std::string& animId, Ref<Buf
         return;
     }
 
-<<<<<<< HEAD
     const vec3 kZeros = {0, 0, 0};
     std::vector<float> times(numKeyframes);
     std::vector<vec3> values(numKeyframes, kZeros);
-=======
-    std::vector<float> times(numKeyframes);
-    std::vector<vec3> values(numKeyframes);
->>>>>>> 57d3d71b6ec68f41a10c1da2f01d096f1308e88c
     for (unsigned int i = 0; i < numKeyframes; ++i) {
         const aiVectorKey& key = nodeChannel->mPositionKeys[i];
         // mTime is measured in ticks, but GLTF time is measured in seconds, so convert.
@@ -1002,14 +997,9 @@ inline void ExtractScaleSampler(Asset& asset, std::string& animId, Ref<Buffer>&
         return;
     }
 
-<<<<<<< HEAD
     const vec3 kZeros = {0, 0, 0};
     std::vector<float> times(numKeyframes);
     std::vector<vec3> values(numKeyframes, kZeros);
-=======
-    std::vector<float> times(numKeyframes);
-    std::vector<vec3> values(numKeyframes);
->>>>>>> 57d3d71b6ec68f41a10c1da2f01d096f1308e88c
     for (unsigned int i = 0; i < numKeyframes; ++i) {
         const aiVectorKey& key = nodeChannel->mScalingKeys[i];
         // mTime is measured in ticks, but GLTF time is measured in seconds, so convert.
@@ -1031,14 +1021,9 @@ inline void ExtractRotationSampler(Asset& asset, std::string& animId, Ref<Buffer
         return;
     }
 
-<<<<<<< HEAD
     const vec4 kZeros = {0, 0, 0, 0};
     std::vector<float> times(numKeyframes);
     std::vector<vec4> values(numKeyframes, kZeros);
-=======
-    std::vector<float> times(numKeyframes);
-    std::vector<vec4> values(numKeyframes);
->>>>>>> 57d3d71b6ec68f41a10c1da2f01d096f1308e88c
     for (unsigned int i = 0; i < numKeyframes; ++i) {
         const aiQuatKey& key = nodeChannel->mRotationKeys[i];
         // mTime is measured in ticks, but GLTF time is measured in seconds, so convert.