# Conflicts:
# ks_includes/locales/KlipperScreen.pot resolved by 05ba96b66e version
# ks_includes/locales/zh_CN/LC_MESSAGES/KlipperScreen.mo resolved by 05ba96b66e version
# ks_includes/locales/zh_CN/LC_MESSAGES/KlipperScreen.po resolved by 05ba96b66e version
# ks_includes/locales/zh_TW/LC_MESSAGES/KlipperScreen.mo resolved by 05ba96b66e version
# ks_includes/locales/zh_TW/LC_MESSAGES/KlipperScreen.po resolved by 05ba96b66e version
# panels/factory_settings.py resolved by 05ba96b66e version
# panels/network.py resolved by 05ba96b66e version