From 736e38ceb0e03995148dcfb5f2575e68ffc3cdaf Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Fri, 7 Jun 2013 10:04:30 -0700
Subject: [PATCH] fix merge issue

---
 libraries/voxels/src/VoxelNode.h   |  2 --
 libraries/voxels/src/VoxelTree.cpp | 10 ----------
 2 files changed, 12 deletions(-)

diff --git a/libraries/voxels/src/VoxelNode.h b/libraries/voxels/src/VoxelNode.h
index adb0744e10..9250d76594 100644
--- a/libraries/voxels/src/VoxelNode.h
+++ b/libraries/voxels/src/VoxelNode.h
@@ -41,8 +41,6 @@ private:
 
     void init(unsigned char * octalCode);
     
-    double _lastChanged;
-
 public:
     VoxelNode(); // root node constructor
     VoxelNode(unsigned char * octalCode); // regular constructor
diff --git a/libraries/voxels/src/VoxelTree.cpp b/libraries/voxels/src/VoxelTree.cpp
index cd3c0565a5..bc4d7569bf 100644
--- a/libraries/voxels/src/VoxelTree.cpp
+++ b/libraries/voxels/src/VoxelTree.cpp
@@ -274,16 +274,6 @@ public:
     bool            pathChanged;
 };
 
-class DeleteVoxelCodeFromTreeArgs {
-public:
-    bool            stage;
-    bool            collapseEmptyTrees;
-    unsigned char*  codeBuffer;
-    int             lengthOfCode;
-    bool            deleteLastChild;
-    bool            pathChanged;
-};
-
 // Note: uses the codeColorBuffer format, but the color's are ignored, because
 // this only finds and deletes the node from the tree.
 void VoxelTree::deleteVoxelCodeFromTree(unsigned char* codeBuffer, bool stage, bool collapseEmptyTrees) {