-
apupier authored
Conflicts: bundles/plugins/org.bonitasoft.studio-models/process.history bundles/plugins/org.bonitasoft.studio.common.diagram/META-INF/MANIFEST.MF bundles/plugins/org.bonitasoft.studio.common/src/org/bonitasoft/studio/common/ModelVersion.java bundles/plugins/org.bonitasoft.studio.common/src/org/bonitasoft/studio/common/jface/SWTBotConstants.java bundles/plugins/org.bonitasoft.studio.engine/src-test/java/org/bonitasoft/studio/engine/export/switcher/FlowElementSwitchTest.java bundles/plugins/org.bonitasoft.studio.properties/src/org/bonitasoft/studio/properties/sections/iteration/IterationPropertySection.java bundles/plugins/org.bonitasoft.studio.properties/src/org/bonitasoft/studio/properties/sections/subprocess/ParametersMappingSection.java tests/org.bonitasoft.studio.tests/META-INF/MANIFEST.MF
fd5e799e