Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-04-27 11:17:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix conflicts

Browse source
This commit is contained in:
Jeff Becker 2016-11-01 10:02:10 -04:00
parent b4e9ed7d18
commit 9575f70f38
No known key found for this signature in database
GPG key ID: AB950234D6EA286B
4 changed files with 0 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

5
SSUData.cpp
View file

@ -234,14 +234,9 @@ namespace transport
if (!m_ReceivedMessages.count (msgID))
{
m_ReceivedMessages.insert (msgID);
<<<<<<< HEAD
m_LastMessageReceivedTime = i2p::util::GetSecondsSinceEpoch ();
if (!msg->IsExpired ())
=======
m_LastMessageReceivedTime = i2p::util::GetSinceEpoch<Time> ();
if (!msg->IsExpired ()) {
EmitEvent({{"type", "transport.recvmsg"} , {"ident", m_Session.GetIdentHashBase64()}, {"number", "1"}});
>>>>>>> bda4170... add web socket ui
m_Handler.PutNextMessage (msg);
}
else