Fixed rebase issue

This commit is contained in:
Rato
2018-03-03 14:09:23 +01:00
parent e357afbe3b
commit e49d6f5593
+1 -1
View File
@@ -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