[xwiki-notifications] [jira@xwiki.org][Issue] Updates for XWIKI-18975: Merge conflict on XWiki.Notifications.Code.NotificationAdministration in some cases when upgrading to XWiki 13.7

Attachments:

• attachment.html (text/html — 15.3 KB)
• attachment.jpg (image/jpeg — 2.8 KB)
• attachment.png (image/png — 213 bytes)