Merge changes from main to resolve conflicts

Signed-off-by: Scott M Stark <[email protected]>
jakartaee · Feb 15, 2024 · af217f2 · af217f2
1 parent 8fd572f
commit af217f2
Show file tree

Hide file tree

Showing 13 changed files with 0 additions and 1,255 deletions.
diff --git a/spec/src/main/asciidoc/javaee/decorators_ee.asciidoc b/spec/src/main/asciidoc/javaee/decorators_ee.asciidoc
diff --git a/spec/src/main/asciidoc/javaee/definition_ee.asciidoc b/spec/src/main/asciidoc/javaee/definition_ee.asciidoc
diff --git a/spec/src/main/asciidoc/javaee/el.asciidoc b/spec/src/main/asciidoc/javaee/el.asciidoc
diff --git a/spec/src/main/asciidoc/javaee/events_ee.asciidoc b/spec/src/main/asciidoc/javaee/events_ee.asciidoc