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

fix incorrect merge conflict resolve

Browse source
This commit is contained in:
weko 2023-05-05 21:55:31 +00:00
parent 7646147ed2
commit 8fcab7b0c1
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libi2pd/RouterInfo.cpp
View file

@ -363,11 +363,7 @@ namespace data
if (!s) return; if (!s) return;
} }
<<<<<<< HEAD
if ((address->s[31] & 0x80) || !i2p::data::CheckStaticKey(address->s, GetIdentHash())) if ((address->s[31] & 0x80) || !i2p::data::CheckStaticKey(address->s, GetIdentHash()))
=======
if (!i2p::data::CheckStaticKey(address->s, GetIdentHash()))
>>>>>>> 146e446b (save only non-default peer profile)
continue; // skip address continue; // skip address
if (address->transportStyle == eTransportNTCP2) if (address->transportStyle == eTransportNTCP2)