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 //