Skip to content

Commit a498dd8

Browse files
committed
...
1 parent 7991da9 commit a498dd8

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

release-notes/VERSION-2.x

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ Project: jackson-databind
3838
#2324: `StringCollectionDeserializer` fails with custom collection
3939
(reported byb Daniil B)
4040
#2326: Block one more gadget type (CVE-2019-12086)
41-
<<<<<<< HEAD:release-notes/VERSION-2.x
4241
- Prevent String coercion of `null` in `WritableObjectId` when calling `JsonGenerator.writeObjectId()`,
4342
mostly relevant for formats like YAML that have native Object Ids
4443

0 commit comments

Comments
 (0)