# Conflicts: # bazarr/app/config.py # bazarr/plex/operations.py # bazarr/subtitles/processing.py # frontend/src/pages/Settings/Plex/index.tsx # frontend/src/types/settings.d.tspull/2834/head
commit
8046d3bb2e
# Conflicts: # bazarr/app/config.py # bazarr/plex/operations.py # bazarr/subtitles/processing.py # frontend/src/pages/Settings/Plex/index.tsx # frontend/src/types/settings.d.tspull/2834/head