Branch: refs/heads/master Home: https://github.com/xwiki-contrib/application-replication Commit: 83dc1dcdbe44d45b322402c154ee0296d3b99cdc https://github.com/xwiki-contrib/application-replication/commit/83dc1dcdbe44... Author: Thomas Mortagne <[email protected]> Date: 2025-12-31 (Wed, 31 Dec 2025) Changed paths: M replication-entity/replication-entity-default/src/main/resources/templates/replication/conflict.vm M replication-test/replication-test-tests/src/test/it/org/xwiki/replication/test/ReplicationIT.java Log Message: ----------- REPLICAT-229: Conflict resolution button is never shown anymore To unsubscribe from these emails, change your notification settings at https://github.com/xwiki-contrib/application-replication/settings/notificati...