From 4a70a0dcaaa088a32c696210ba8703ead72cb579 Mon Sep 17 00:00:00 2001
From: Somdev Sangwan <s0md3v@gmail.com>
Date: Thu, 1 Jun 2023 11:31:37 +0530
Subject: [PATCH] fix merge conflict

---
 core/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/utils.py b/core/utils.py
index ee2d422..50aca35 100644
--- a/core/utils.py
+++ b/core/utils.py
@@ -23,7 +23,7 @@ def detect_fps(input_path):
     output = os.popen(f'ffprobe -v error -select_streams v -of default=noprint_wrappers=1:nokey=1 -show_entries stream=r_frame_rate "{input_path}"').read()
     if "/" in output:
         try:
-            return int(output.split("/")[0]) // int(output.split("/")[1]), output.removesuffix('\n')
+            return int(output.split("/")[0]) // int(output.split("/")[1].strip()), output.strip()
         except:
             pass
     return 30, 30