# Conflicts: # bazarr.py # bazarr/get_series.py # bazarr/main.py # bazarr/scheduler.py # views/historymovies.tpl # views/historyseries.tpl # views/menu.tpl