Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-29 09:26:18 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed merge

Browse Source
This commit is contained in:
csoler 2016-01-13 20:57:03 -05:00
parent d2f56a5c53
commit ed12b7a243
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libretroshare/src/gxs/rsgxsnetservice.cc
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;
#endif
<<<<<<< HEAD
// go groups requested in transaction tr
std::list<RsNxsItem*>::iterator lit = tr->mItems.begin();