Gitiles
Code Review
Sign In
gerrit-public.fairphone.software
/
platform
/
external
/
jackson-databind
/
72cd4025a229fb28ec133235003dd4616f70afaa
/
.
/
.gitattributes
blob: 780a8a8fe1a5a68af5bb80e683fcbe19ddf20955 [
file
] [
log
] [
blame
]
# 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