feat(block-editor) #26895 fix conflicts

dotCMS · Dec 11, 2023 · f19d69c · f19d69c
1 parent 63c58e5
commit f19d69c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/dotCMS/src/main/webapp/html/css/dotcms-block-editor.css b/dotCMS/src/main/webapp/html/css/dotcms-block-editor.css
diff --git a/dotCMS/src/main/webapp/html/dotcms-block-editor.js b/dotCMS/src/main/webapp/html/dotcms-block-editor.js