From 83bf4241e4ea7d5b6d980221053563a472e5fd3c Mon Sep 17 00:00:00 2001
From: Eric Levin <ericrius1@gmail.com>
Date: Mon, 1 Jun 2015 15:16:08 -0700
Subject: [PATCH] resolved merge conflicts... but now lines not flying across
 clients

---
 cmake/externals/polyvox/CMakeLists.txt       |  4 ++--
 libraries/entities/src/EntityPropertyFlags.h | 11 ++++-------
 libraries/octree/src/OctreePacketData.h      |  2 +-
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/cmake/externals/polyvox/CMakeLists.txt b/cmake/externals/polyvox/CMakeLists.txt
index 76302f9b4a..1417759f4b 100644
--- a/cmake/externals/polyvox/CMakeLists.txt
+++ b/cmake/externals/polyvox/CMakeLists.txt
@@ -3,8 +3,8 @@ set(EXTERNAL_NAME polyvox)
 include(ExternalProject)
 ExternalProject_Add(
   ${EXTERNAL_NAME}
-  URL http://hifi-public.s3.amazonaws.com/dependencies/polyvox-master-2015-5-27.zip
-  URL_MD5 e3dd09a24df4db29ba370e3bea753388
+  URL http://hifi-public.s3.amazonaws.com/dependencies/polyvox.zip
+  URL_MD5  URL_MD5 904b840328278c9b36fa7a14be730c34
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
   BINARY_DIR ${EXTERNAL_PROJECT_PREFIX}/build
   LOG_DOWNLOAD 1
diff --git a/libraries/entities/src/EntityPropertyFlags.h b/libraries/entities/src/EntityPropertyFlags.h
index 9b93dcd373..8eb09fece0 100644
--- a/libraries/entities/src/EntityPropertyFlags.h
+++ b/libraries/entities/src/EntityPropertyFlags.h
@@ -109,18 +109,15 @@ enum EntityPropertyList {
     PROP_COLLISION_SOUND_URL,
     PROP_RESTITUTION,
     PROP_FRICTION,
-<<<<<<< HEAD
-    
-    //for lines
-    PROP_LINE_WIDTH,
-    PROP_LINE_POINTS,
-=======
 
     PROP_VOXEL_VOLUME_SIZE,
     PROP_VOXEL_DATA,
     PROP_VOXEL_SURFACE_STYLE,
 
->>>>>>> master
+    //for lines
+    PROP_LINE_WIDTH,
+    PROP_LINE_POINTS,
+    
     ////////////////////////////////////////////////////////////////////////////////////////////////////
     // ATTENTION: add new properties ABOVE this line
     PROP_AFTER_LAST_ITEM,
diff --git a/libraries/octree/src/OctreePacketData.h b/libraries/octree/src/OctreePacketData.h
index ed9c0a4703..9476fe024e 100644
--- a/libraries/octree/src/OctreePacketData.h
+++ b/libraries/octree/src/OctreePacketData.h
@@ -244,7 +244,7 @@ public:
     static int unpackDataFromBytes(const unsigned char* dataBytes, QString& result);
     static int unpackDataFromBytes(const unsigned char* dataBytes, QUuid& result);
     static int unpackDataFromBytes(const unsigned char* dataBytes, xColor& result);
-    static int uppackDataFromBytes(const unsigned char* dataBytes, QVector<glm::vec3>& result);
+    static int unpackDataFromBytes(const unsigned char* dataBytes, QVector<glm::vec3>& result);
     static int unpackDataFromBytes(const unsigned char* dataBytes, QByteArray& result);