From 8625226be8a978d56e57fd418d2cd44596765a0d Mon Sep 17 00:00:00 2001 From: lla-dane Date: Sat, 12 Jul 2025 08:30:26 +0530 Subject: [PATCH] fix merge conflicts --- libp2p/abc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libp2p/abc.py b/libp2p/abc.py index 158d0083..6d405040 100644 --- a/libp2p/abc.py +++ b/libp2p/abc.py @@ -48,9 +48,9 @@ from libp2p.peer.peerinfo import ( ) if TYPE_CHECKING: - from libp2p.protocol_muxer.multiselect import Multiselect from libp2p.peer.envelope import Envelope from libp2p.peer.peer_record import PeerRecord + from libp2p.protocol_muxer.multiselect import Multiselect from libp2p.pubsub.pubsub import ( Pubsub, )