From e49d6f55934649076180b7d92ad23e8d6876023e Mon Sep 17 00:00:00 2001 From: Rato Date: Sat, 3 Mar 2018 14:09:23 +0100 Subject: [PATCH] Fixed rebase issue --- guessit/rules/properties/screen_size.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guessit/rules/properties/screen_size.py b/guessit/rules/properties/screen_size.py index f0e5972..83a797c 100644 --- a/guessit/rules/properties/screen_size.py +++ b/guessit/rules/properties/screen_size.py @@ -52,7 +52,7 @@ def screen_size(config): rebulk.regex(frame_rate_pattern + '(p|fps)', name='frame_rate', formatter=FrameRate.fromstring, disabled=lambda context: is_disabled(context, 'frame_rate')) - rebulk.rules(PostProcessScreenSize(progressive, min_ar, max_ar), ScreenSizeOnlyOne, RemoveScreenSizeConflicts) + rebulk.rules(PostProcessScreenSize(progressive, min_ar, max_ar), ScreenSizeOnlyOne, ResolveScreenSizeConflicts) return rebulk