fixed merge

This commit is contained in:
csoler 2016-01-13 20:57:03 -05:00
parent d2f56a5c53
commit ed12b7a243

View File

@ -3112,7 +3112,6 @@ void RsGxsNetService::locked_genSendMsgsTransaction(NxsTransaction* tr)
GXSNETDEBUG_P_(tr->mTransaction->PeerId()) << "locked_genSendMsgsTransaction() Generating Msg data send fron TransN: " << tr->mTransaction->transactionNumber << std::endl; GXSNETDEBUG_P_(tr->mTransaction->PeerId()) << "locked_genSendMsgsTransaction() Generating Msg data send fron TransN: " << tr->mTransaction->transactionNumber << std::endl;
#endif #endif
<<<<<<< HEAD
// go groups requested in transaction tr // go groups requested in transaction tr
std::list<RsNxsItem*>::iterator lit = tr->mItems.begin(); std::list<RsNxsItem*>::iterator lit = tr->mItems.begin();