https://github.com/FasterXML/jackson-databind
Raw File
Tip revision: 569b76b641937890fa7e7aaf0bbe0a1fe43d26f2 authored by Tatu Saloranta on 20 January 2021, 23:16:21 UTC
Merge branch '2.9' into 2.10
Tip revision: 569b76b
.gitattributes
# Do not merge `pom.xml` from older version, as it will typically conflict
#
# note: also need:
# git config --global merge.ours.driver true
# (and if ever need to disable change `true` to `false`

pom.xml merge=ours
back to top