Commit 7318984
committed
Resolve merge conflicts with main branch
- Keep SchemaCompiler.java (identical in both branches)
- Remove JsonSchemaCheckIT.java (replaced by abstract base class architecture)
- Preserve JsonSchemaDraft4Test.java debug skeleton with @disabled annotation and local isStrict() method
Preserves architectural improvements while integrating compatible changes from main.File tree
1 file changed
+4
-0
lines changed- json-java21-schema/src/main/java/io/github/simbo1905/json/schema
1 file changed
+4
-0
lines changedLines changed: 4 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
626 | 626 | | |
627 | 627 | | |
628 | 628 | | |
| 629 | + | |
629 | 630 | | |
| 631 | + | |
| 632 | + | |
| 633 | + | |
630 | 634 | | |
631 | 635 | | |
632 | 636 | | |
| |||
0 commit comments