# Conflicts: # resources/logic_pipeline.js # resources/logic_state.js # resources/logic_ui.js # web/conf_builder/conf-builder-config-management.js # web/conf_builder/conf-builder-main.js
# Conflicts: # resources/logic_pipeline.js # resources/logic_state.js # resources/logic_ui.js # web/conf_builder/conf-builder-config-management.js # web/conf_builder/conf-builder-main.js