[xwiki-notifications] [jira@xwiki.org][Issue] (XWIKI-15308) Merge conflicts on NotificationsDisplayerUIX when upgrading XWiki from 9.11.4 to 10.4 on MySQL

Attachments:

• attachment.html (text/html — 12.3 KB)
• attachment.png (image/png — 1.1 KB)
• attachment.jpg (image/jpeg — 2.8 KB)
• attachment.png (image/png — 341 bytes)