From c3a8c445453a8b0b4bda4fb60c893afe60f06786 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Mon, 9 Mar 2015 09:55:35 -0700 Subject: [PATCH] oops, removing a typo --- interface/src/octree/OctreePacketProcessor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/octree/OctreePacketProcessor.cpp b/interface/src/octree/OctreePacketProcessor.cpp index e735239331..34aae97446 100644 --- a/interface/src/octree/OctreePacketProcessor.cpp +++ b/interface/src/octree/OctreePacketProcessor.cpp @@ -1,4 +1,4 @@ -/Merge branch 'master' of ssh://github.com/highfidelity/hifi into isentropic/ +//Merge branch 'master' of ssh://github.com/highfidelity/hifi into isentropic/ // OctreePacketProcessor.cpp // interface/src/octree //