updates

video_to_video/video_to_video_model.py

@@ -17,17 +17,10 @@ from diffusers import AutoencoderKLTemporalDecoder
 import requests
 
 def download_model(url, model_path):
-<<<<<<< HEAD
     if not os.path.exists(os.path.join(model_path, 'model.pt')):
         print(f"Model not found at {model_path}, downloading...")
         response = requests.get(url, stream=True)
         with open(os.path.join(model_path, 'model.pt'), 'wb') as f:
-=======
-    if not os.path.exists(os.path.join(model_path, 'heavy_deg.pt')):
-        print(f"Model not found at {model_path}, downloading...")
-        response = requests.get(url, stream=True)
-        with open(os.path.join(model_path, 'heavy_deg.pt'), 'wb') as f:
->>>>>>> cf76b2c6028ef0b7cad14bee801342e5b79b8cd6
             for chunk in response.iter_content(chunk_size=1024):
                 if chunk:
                     f.write(chunk)