Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 08:04:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix missed conflict on merge with upstream/master

Browse source
This commit is contained in:
Stephen Birarda 2015-05-11 12:58:00 -07:00
parent 8c6715e4fc
commit 7b903d29e7
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assignment-client/src/AssignmentClientMonitor.cpp
View file

@ -194,12 +194,8 @@ void AssignmentClientMonitor::checkSpares() {
qDebug() << "asking child" << aSpareId << "to exit.";
SharedNodePointer childNode = nodeList->nodeWithUUID(aSpareId);
childNode->activateLocalSocket();
<<<<<<< HEAD
QByteArray diePacket = byteArrayWithPopulatedHeader(PacketTypeStopNode);
=======
QByteArray diePacket = nodeList->byteArrayWithPopulatedHeader(PacketTypeStopNode);
>>>>>>> 5160eb5b94951200390de0de91962cc2aa9efccb
nodeList->writeUnverifiedDatagram(diePacket, childNode);
}
}