From 1944deece45314356c76373bcf306e64d91136ca Mon Sep 17 00:00:00 2001
From: Dariusz Kedzierski <dkedzierski@syncad.com>
Date: Tue, 10 Nov 2020 00:51:40 +0100
Subject: [PATCH] Removed unused imports

---
 hive/indexer/follow.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/hive/indexer/follow.py b/hive/indexer/follow.py
index 79b0ee876..dfbe74258 100644
--- a/hive/indexer/follow.py
+++ b/hive/indexer/follow.py
@@ -1,11 +1,6 @@
 """Handles follow operations."""
 
 import logging
-<<<<<<< HEAD
-=======
-from time import perf_counter as perf
-from json import dumps
->>>>>>> Cast all follow name data to string. Should protect against setting non string data types as names in follower and following
 
 from funcy.seqs import first
 from hive.db.adapter import Db
-- 
GitLab