# Conflicts: # ARCHITECTURE.md # api/__init__.py # api/network_check.py # web/modules/locales.js # web/modules/ui_scan_lists.js # web/modules/ui_settings_page.js
# Conflicts: # ARCHITECTURE.md # api/__init__.py # api/network_check.py # web/modules/locales.js # web/modules/ui_scan_lists.js # web/modules/ui_settings_page.js