Branch: refs/heads/master Home: https://github.com/xwiki-contrib/application-replication Commit: ed77d410a777b469b92198dc789cb0b02c2a69d7 https://github.com/xwiki-contrib/application-replication/commit/ed77d410a77… Author: Thomas Mortagne <thomas.mortagne(a)gmail.com> Date: 2025-11-24 (Mon, 24 Nov 2025) Changed paths: M replication-entity/replication-entity-default/src/main/resources/templates/replication/conflict.vm Log Message: ----------- REPLICAT-228: Merge Conflict button "Mark as Resolved" is clickable without edit rights To unsubscribe from these emails, change your notification settings at https://github.com/xwiki-contrib/application-replication/settings/notificat…