fix incorrect merge conflict resolve

1 year ago · 8fcab7b0c1
parent 7646147ed2
commit 8fcab7b0c1
1 changed files with 0 additions and 4 deletions
--- a/libi2pd/RouterInfo.cpp
+++ b/libi2pd/RouterInfo.cpp
@ -363,11 +363,7 @@ namespace data
 				if (!s) return;
 			}
 			
-<<<<<<< HEAD
            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
 			
 			if (address->transportStyle == eTransportNTCP2)