merged changes

app_utils.py

@@ -106,17 +106,6 @@ def clean_all(files):
         clean_me(me)
 
 
-<<<<<<< HEAD
-def get_model_bin(url, output_path):
-    # print('Getting model dir: ', output_path)
-    if not os.path.exists(output_path):
-        print('Downloading model')
-
-        # Check if folder exists
-        output_folder = output_path.replace('\\','/').split('/')[0]
-        if not os.path.exists(output_folder):
-            os.makedirs(output_folder, exist_ok=True)
-=======
 def create_directory(path):
     os.makedirs(os.path.dirname(path), exist_ok=True)
 
@@ -125,18 +114,12 @@ def get_model_bin(url, output_path):
     # print('Getting model dir: ', output_path)
     if not os.path.exists(output_path):
         create_directory(output_path)
->>>>>>> 878ecf212e9f3f2f6e923e3bfff6ec899dc40143
 
         urllib.request.urlretrieve(url, output_path)
 
         # cmd = "wget -O %s %s" % (output_path, url)
         # print(cmd)
         # os.system(cmd)
-<<<<<<< HEAD
-    else:
-        print('Model exists')
-=======
->>>>>>> 878ecf212e9f3f2f6e923e3bfff6ec899dc40143
 
     return output_path