Commit 7942dd0c authored by Stavros Sachtouris's avatar Stavros Sachtouris
Browse files

Resolve conflict

parent fba9be97
......@@ -37,13 +37,10 @@ import time
import datetime
import os
import sys
<<<<<<< HEAD
import tempfile
=======
from logging import getLogger
kloger = getLogger('kamaki')
>>>>>>> origin/develop
try:
from progress.bar import FillingCirclesBar as IncrementalBar
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment