f829cd5a4c
# Conflicts: # konova/sub_settings/django_settings.py # konova/sub_settings/sso_settings.py # requirements.txt