297041ed3e
Conflicts: public/js/complete_setup.js setup/doctype/setup_control/setup_control.py
Conflicts: public/js/complete_setup.js setup/doctype/setup_control/setup_control.py