oops, removing a typo

This commit is contained in:
Andrew Meadows 2015-03-09 09:55:35 -07:00
parent c0ed3edbbb
commit c3a8c44545

View file

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