import tqdm

podfox/__init__.py

@@ -39,10 +39,7 @@ import re
 
 from email.utils import parsedate
 from time import time, mktime, gmtime, strftime, sleep
-<<<<<<< cc4abf40a2e4fe00e52aff8d4e1c21d2219455f6
 from tqdm import tqdm
-=======
->>>>>>> Exception handling for connections error and timeouts
 
 CONFIGURATION = {}
 
@@ -338,7 +335,7 @@ def download_single(folder, url, filename):
 
     if filename is None:
         filename = get_original_filename(url)
-    
+
     print_green("{:s} downloading".format(filename))
     for i in range(connection_retries):
         try: