mirror of
https://github.com/overte-org/overte.git
synced 2025-04-20 04:44:11 +02:00
resolve final conflict in Application
This commit is contained in:
parent
05dde9d8f5
commit
6a02e6d001
1 changed files with 0 additions and 3 deletions
|
@ -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();
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue