resolve conflicts for removal of ACK2 process

This commit is contained in:
Stephen Birarda 2015-07-28 09:54:46 -07:00
parent 9cc415fb26
commit 3efd1be3d6

View file

@ -167,10 +167,6 @@ void Connection::processControl(unique_ptr<ControlPacket> controlPacket) {
break;
}
case ControlPacket::ACK2: {
// change the type of the packet to an ACK2 and send it back
controlPacket->setType(ControlPacket::ACK2);
_sendQueue->sendPacket(*controlPacket);
break;
}
case ControlPacket::NAK: {