mendix · ozgeMendix · Sep 18, 2025 · Sep 17, 2025
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,3 +1,9 @@
+## Release 4.2.0
+
+* We added a conflict resolution feature that allows workflow administrators to resolve incompatible workflows in groups. For more information, refer to the Workflow Commons module documentation.
+
+_______
+
 ## Release 4.1.0
 
 * We upgraded the module to Mendix 11.2.0

diff --git a/Releases/WorkflowCommons-4-2-0.mpk b/Releases/WorkflowCommons-4-2-0.mpk
diff --git a/Source/ExpenseRequestStarterApp.mpr b/Source/ExpenseRequestStarterApp.mpr
diff --git a/Source/mprcontents/01/8f/018f94d1-7187-4b3d-8ed8-dd2687ffc24a.mxunit b/Source/mprcontents/01/8f/018f94d1-7187-4b3d-8ed8-dd2687ffc24a.mxunit
diff --git a/Source/mprcontents/02/87/02876440-3bcf-4349-9493-284461c268dc.mxunit b/Source/mprcontents/02/87/02876440-3bcf-4349-9493-284461c268dc.mxunit
diff --git a/Source/mprcontents/0f/8c/0f8c7d01-208f-4a1a-bb61-33b41f2db197.mxunit b/Source/mprcontents/0f/8c/0f8c7d01-208f-4a1a-bb61-33b41f2db197.mxunit
diff --git a/Source/mprcontents/11/b6/11b6f5d9-7b86-4e97-bc5d-21d23869b776.mxunit b/Source/mprcontents/11/b6/11b6f5d9-7b86-4e97-bc5d-21d23869b776.mxunit
diff --git a/Source/mprcontents/13/5c/135c4c22-76d1-4e36-a600-ef5d9f1a591c.mxunit b/Source/mprcontents/13/5c/135c4c22-76d1-4e36-a600-ef5d9f1a591c.mxunit
diff --git a/Source/mprcontents/24/f8/24f87984-7dd5-4110-a0e7-a176379b9b77.mxunit b/Source/mprcontents/24/f8/24f87984-7dd5-4110-a0e7-a176379b9b77.mxunit
diff --git a/Source/mprcontents/25/2a/252a1560-9ce6-4667-8879-5b2b5acf18ed.mxunit b/Source/mprcontents/25/2a/252a1560-9ce6-4667-8879-5b2b5acf18ed.mxunit
diff --git a/Source/mprcontents/25/2c/252c10f0-ac1b-4abc-abbb-2499bc8eb5ac.mxunit b/Source/mprcontents/25/2c/252c10f0-ac1b-4abc-abbb-2499bc8eb5ac.mxunit
diff --git a/Source/mprcontents/2b/b6/2bb60753-b395-4235-833f-bd11879369e4.mxunit b/Source/mprcontents/2b/b6/2bb60753-b395-4235-833f-bd11879369e4.mxunit
diff --git a/Source/mprcontents/2f/c8/2fc876c2-46ef-4aff-a735-b5862bf1d541.mxunit b/Source/mprcontents/2f/c8/2fc876c2-46ef-4aff-a735-b5862bf1d541.mxunit
diff --git a/Source/mprcontents/31/87/3187bfa5-6346-44bd-a3ae-61415a559eee.mxunit b/Source/mprcontents/31/87/3187bfa5-6346-44bd-a3ae-61415a559eee.mxunit
diff --git a/Source/mprcontents/3c/23/3c238961-f94f-4fbe-a0aa-c4f35fb4064c.mxunit b/Source/mprcontents/3c/23/3c238961-f94f-4fbe-a0aa-c4f35fb4064c.mxunit
diff --git a/Source/mprcontents/41/a8/41a8b3ea-6902-4070-8109-b8b953f5adcb.mxunit b/Source/mprcontents/41/a8/41a8b3ea-6902-4070-8109-b8b953f5adcb.mxunit
diff --git a/Source/mprcontents/48/91/489196f5-7337-4534-ad72-ab4fd3c297ec.mxunit b/Source/mprcontents/48/91/489196f5-7337-4534-ad72-ab4fd3c297ec.mxunit
diff --git a/Source/mprcontents/61/63/6163d1fc-63d1-46ed-be21-74de8bf49398.mxunit b/Source/mprcontents/61/63/6163d1fc-63d1-46ed-be21-74de8bf49398.mxunit
diff --git a/Source/mprcontents/69/3d/693dd7a0-6295-4ea7-852b-31d39790139f.mxunit b/Source/mprcontents/69/3d/693dd7a0-6295-4ea7-852b-31d39790139f.mxunit
diff --git a/Source/mprcontents/74/9a/749a8236-d08e-453a-a013-35a142bcd688.mxunit b/Source/mprcontents/74/9a/749a8236-d08e-453a-a013-35a142bcd688.mxunit
diff --git a/Source/mprcontents/7c/80/7c80bada-802f-45c2-9047-3ff3532dd4ca.mxunit b/Source/mprcontents/7c/80/7c80bada-802f-45c2-9047-3ff3532dd4ca.mxunit
diff --git a/Source/mprcontents/82/ec/82ecc79c-8399-4a0c-b63a-9cd47a17bf8e.mxunit b/Source/mprcontents/82/ec/82ecc79c-8399-4a0c-b63a-9cd47a17bf8e.mxunit
diff --git a/Source/mprcontents/83/3a/833ae3ff-ead7-46dd-ab30-dff4c5f0fbf1.mxunit b/Source/mprcontents/83/3a/833ae3ff-ead7-46dd-ab30-dff4c5f0fbf1.mxunit
diff --git a/Source/mprcontents/8b/d2/8bd224d8-0d6b-4eaf-a8da-538d8b05695d.mxunit b/Source/mprcontents/8b/d2/8bd224d8-0d6b-4eaf-a8da-538d8b05695d.mxunit
diff --git a/Source/mprcontents/9f/e2/9fe2943a-25db-4644-82c8-024b09f5d491.mxunit b/Source/mprcontents/9f/e2/9fe2943a-25db-4644-82c8-024b09f5d491.mxunit
diff --git a/Source/mprcontents/a3/24/a3244a45-d78b-4a68-8f54-23c6dab17e4d.mxunit b/Source/mprcontents/a3/24/a3244a45-d78b-4a68-8f54-23c6dab17e4d.mxunit
diff --git a/Source/mprcontents/a5/1c/a51c7365-8986-41b9-bc95-72559417e575.mxunit b/Source/mprcontents/a5/1c/a51c7365-8986-41b9-bc95-72559417e575.mxunit
diff --git a/Source/mprcontents/a6/d4/a6d4ef88-becf-4f11-ba03-11cabffff1e7.mxunit b/Source/mprcontents/a6/d4/a6d4ef88-becf-4f11-ba03-11cabffff1e7.mxunit
diff --git a/Source/mprcontents/b1/cd/b1cd5a8a-554c-4a34-8de0-2eb71488c0ef.mxunit b/Source/mprcontents/b1/cd/b1cd5a8a-554c-4a34-8de0-2eb71488c0ef.mxunit
diff --git a/Source/mprcontents/dd/13/dd13f3e6-4604-4f92-a25f-372907869dae.mxunit b/Source/mprcontents/dd/13/dd13f3e6-4604-4f92-a25f-372907869dae.mxunit
diff --git a/Source/mprcontents/e5/d7/e5d75c81-5bc1-47df-850a-d923d1f86197.mxunit b/Source/mprcontents/e5/d7/e5d75c81-5bc1-47df-850a-d923d1f86197.mxunit
diff --git a/Source/mprcontents/e9/14/e91435d5-4529-4c6b-ad00-7763908122fb.mxunit b/Source/mprcontents/e9/14/e91435d5-4529-4c6b-ad00-7763908122fb.mxunit
diff --git a/Source/mprcontents/fb/05/fb05eb37-22b5-42d7-8085-bcdbf03220ca.mxunit b/Source/mprcontents/fb/05/fb05eb37-22b5-42d7-8085-bcdbf03220ca.mxunit
diff --git a/Source/mprcontents/fc/3a/fc3ae753-5037-4539-9fe3-2447bb2ff75f.mxunit b/Source/mprcontents/fc/3a/fc3ae753-5037-4539-9fe3-2447bb2ff75f.mxunit
diff --git a/Source/mprcontents/ff/cb/ffcb4b6f-6216-45f4-9dbb-3101c315317d.mxunit b/Source/mprcontents/ff/cb/ffcb4b6f-6216-45f4-9dbb-3101c315317d.mxunit