From bda66aa5250cde4949bdcc0da1b83053b1337a3d Mon Sep 17 00:00:00 2001
From: Magnus Walbeck <mw@mwalbeck.org>
Date: Tue, 4 Jul 2017 15:23:43 +0200
Subject: [PATCH] import tqdm

---
 podfox/__init__.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/podfox/__init__.py b/podfox/__init__.py
index 30a8fb4..a952fd0 100755
--- a/podfox/__init__.py
+++ b/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: