Remove leftover imports

2019-07-24 21:57:46 +08:00 · 2019-07-24 21:57:46 +08:00 · 3f52b0dc0a
commit 3f52b0dc0a
parent b528c211b9
1 changed files with 0 additions and 11 deletions
--- a/libp2p/pubsub/pubsub.py
+++ b/libp2p/pubsub/pubsub.py
@ -1,17 +1,6 @@
 # pylint: disable=no-name-in-module
 import asyncio
 import time
-<<<<<<< HEAD
-from typing import (
-    Any,
-    Dict,
-    List,
-    Sequence,
-    Tuple,
-)
-
-=======
->>>>>>> Add basic functionalities of `publish`
 from typing import (
    Any,
    Dict,