From 7b903d29e72625b8f83141f4f8bf09ccb5236f5a Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 11 May 2015 12:58:00 -0700 Subject: [PATCH] fix missed conflict on merge with upstream/master --- assignment-client/src/AssignmentClientMonitor.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/assignment-client/src/AssignmentClientMonitor.cpp b/assignment-client/src/AssignmentClientMonitor.cpp index d57174c32d..d19eb90df6 100644 --- a/assignment-client/src/AssignmentClientMonitor.cpp +++ b/assignment-client/src/AssignmentClientMonitor.cpp @@ -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); } }