fix merge conflicts

Author: yurnov

.github/dependabot.yml

@@ -8,4 +8,4 @@ updates:
   - package-ecosystem: "pip"
     directory: "src"
     schedule:
-      interval: "weekly"
+      interval: "weekly"

Dockerfile

@@ -14,4 +14,4 @@ COPY src /bot
 
 WORKDIR /bot
 
-CMD ["python", "main.py"]
+CMD ["python", "main.py"]

README.md

@@ -135,9 +135,5 @@ Example:
 ```bash
   **https://www.youtube.com/watch?v=rxdu3whDVSM or with a space ** https://www.youtube.com/watch?v=rxdu3whDVSM
 ```
-<<<<<<< HEAD
-=======
-
->>>>>>> upstream/main
 - Full list of supported sites here: [yt-dlp Supported Sites](https://github.com/yt-dlp/yt-dlp/blob/master/supportedsites.md)
 ---

src/video_utils.py

@@ -70,11 +70,7 @@ def get_video_duration(video_path):
         "format=duration",
         "-of",
         "default=noprint_wrappers=1:nokey=1",
-<<<<<<< HEAD:src/video_utils.py
         video_path,
-=======
-        video_path
->>>>>>> upstream/main:video_utils.py
     ]
     try:
         result = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, check=True)
@@ -109,11 +105,7 @@ def download_video(url):
         "vcodec:h264,fps,res,acodec:m4a",
         url,
         "-o",
-<<<<<<< HEAD:src/video_utils.py
         os.path.join(temp_dir, "%(id)s.%(ext)s"),
-=======
-        os.path.join(temp_dir, "%(id)s.%(ext)s")
->>>>>>> upstream/main:video_utils.py
     ]
 
     try: