fix merge conflicts

This commit is contained in:
lla-dane
2025-07-12 08:30:26 +05:30
parent c2b1738cd9
commit 8625226be8

View File

@ -48,9 +48,9 @@ from libp2p.peer.peerinfo import (
) )
if TYPE_CHECKING: if TYPE_CHECKING:
from libp2p.protocol_muxer.multiselect import Multiselect
from libp2p.peer.envelope import Envelope from libp2p.peer.envelope import Envelope
from libp2p.peer.peer_record import PeerRecord from libp2p.peer.peer_record import PeerRecord
from libp2p.protocol_muxer.multiselect import Multiselect
from libp2p.pubsub.pubsub import ( from libp2p.pubsub.pubsub import (
Pubsub, Pubsub,
) )