merged some other conflicts

Davda-James · Davda-James · commit b1dbb8e6d9ee · 2024-10-10T22:28:45.000+05:30
diff --git a/video_cropper/video_cropper.py b/video_cropper/video_cropper.py
@@ -12,7 +12,7 @@ def to_int(a, rel_to):
     EG: 50% -> 0.5*rel_to
     '''
 
-    if isinstance(a):
+    if isinstance(a,int):
         return a
     else:
         if '%' in a:
