From 3f52b0dc0abcd6872f0ac9919e5a1442e89b6f44 Mon Sep 17 00:00:00 2001
From: mhchia <kevin.mh.chia@gmail.com>
Date: Wed, 24 Jul 2019 21:57:46 +0800
Subject: [PATCH] Remove leftover imports

---
 libp2p/pubsub/pubsub.py | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/libp2p/pubsub/pubsub.py b/libp2p/pubsub/pubsub.py
index cd2345f..af37ee0 100644
--- 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,