Merge pull request #2622 from douakli/XWIKI-19180

XWIKI-19180: In case of merge conflict choosing "Reload editors" won't refresh the content
xwiki · Jan 24, 2024 · bd40c93 · bd40c93
2 parents 7b5c552 + 84a1f00
commit bd40c93
Show file tree

Hide file tree

Showing 11 changed files with 230 additions and 741 deletions.
diff --git a/...xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/Ajax.xml b/...xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/Ajax.xml
diff --git a/...latform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml b/...latform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml
diff --git a/...e/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java b/...e/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java