From 0936bdbdd3e2d3f3d31c2018fd220971b46b8ed3 Mon Sep 17 00:00:00 2001
From: jleute <julia.leute@gmail.com>
Date: Sat, 9 Jun 2018 00:47:34 +0200
Subject: [PATCH] doesn't belong here.

---
 lbrynet/tests/util.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lbrynet/tests/util.py b/lbrynet/tests/util.py
index 25af63697..68b445c8e 100644
--- a/lbrynet/tests/util.py
+++ b/lbrynet/tests/util.py
@@ -10,11 +10,6 @@ import mock
 DEFAULT_TIMESTAMP = datetime.datetime(2016, 1, 1)
 DEFAULT_ISO_TIME = time.mktime(DEFAULT_TIMESTAMP.timetuple())
 
-<<<<<<< HEAD
-log = logging.getLogger("lbrynet.tests.util")
-=======
->>>>>>> 2619c396d980944802a3f7e0800e92794cc3de5a
-
 
 def mk_db_and_blob_dir():
     db_dir = tempfile.mkdtemp()