mirror of
https://github.com/PurpleI2P/i2pd.git
synced 2025-04-23 17:36:37 +02:00
Merge branch 'master' of github.com:majestrate/i2pd
Fixed Conflicts: SAM.cpp
This commit is contained in:
commit
0b3a719a95
1 changed files with 0 additions and 1 deletions
1
SAM.cpp
1
SAM.cpp
|
@ -49,7 +49,6 @@ namespace client
|
||||||
{
|
{
|
||||||
if (m_Session)
|
if (m_Session)
|
||||||
m_Session->DelSocket (shared_from_this ());
|
m_Session->DelSocket (shared_from_this ());
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case eSAMSocketTypeAcceptor:
|
case eSAMSocketTypeAcceptor:
|
||||||
|
|
Loading…
Add table
Reference in a new issue