resolve final conflict in Application

This commit is contained in:
Stephen Birarda 2015-07-15 16:23:23 -07:00
parent 05dde9d8f5
commit 6a02e6d001

View file

@ -3952,9 +3952,6 @@ int Application::processOctreeStats(NLPacket& packet, SharedNodePointer sendingN
qCDebug(interfaceapp, "stats from new %s server... [%f, %f, %f, %f]",
qPrintable(serverType),
(double)rootDetails.x, (double)rootDetails.y, (double)rootDetails.z, (double)rootDetails.s);
} else {
jurisdiction->unlock();
}
} else {
jurisdiction->unlock();
}