4a22071f94d55934615bad4b8869eea81c7373e7
# Conflicts: # sf_manufacturing/models/res_config_setting.py # sf_manufacturing/views/res_config_settings_views.xml # sf_mrs_connect/models/res_config_setting.py
#jikimo_sf
Description
# Conflicts: # sf_manufacturing/models/res_config_setting.py # sf_manufacturing/views/res_config_settings_views.xml # sf_mrs_connect/models/res_config_setting.py
#jikimo_sf