[xwiki-notifications] [jira@xwiki.org][Issue] Updates for CRAPP-394: Attachment might be lost when fixing conflict

Attachments:

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