Skip to content

Commit 0d03b88

Browse files
committed
compile
1 parent 7318984 commit 0d03b88

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

json-java21-schema/src/main/java/io/github/simbo1905/json/schema/SchemaCompiler.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -626,11 +626,7 @@ private static JsonSchema compileInternalWithContext(Session session, JsonValue
626626
}
627627

628628
if (!(schemaJson instanceof JsonObject obj)) {
629-
<<<<<<< HEAD
630-
throw new IllegalArgumentException("Schema must be an object");
631-
=======
632629
throw new IllegalArgumentException("Schema must be an object or boolean");
633-
>>>>>>> origin/main
634630
}
635631

636632
// Process definitions first and build pointer index

0 commit comments

Comments
 (0)