doesn't belong here.

This commit is contained in:
jleute 2018-06-09 00:47:34 +02:00
parent e381e4c063
commit 0936bdbdd3

View file

@ -10,11 +10,6 @@ import mock
DEFAULT_TIMESTAMP = datetime.datetime(2016, 1, 1) DEFAULT_TIMESTAMP = datetime.datetime(2016, 1, 1)
DEFAULT_ISO_TIME = time.mktime(DEFAULT_TIMESTAMP.timetuple()) DEFAULT_ISO_TIME = time.mktime(DEFAULT_TIMESTAMP.timetuple())
<<<<<<< HEAD
log = logging.getLogger("lbrynet.tests.util")
=======
>>>>>>> 2619c396d980944802a3f7e0800e92794cc3de5a
def mk_db_and_blob_dir(): def mk_db_and_blob_dir():
db_dir = tempfile.mkdtemp() db_dir = tempfile.mkdtemp()