Gitiles
Code Review
Sign In
gerrit-public.fairphone.software
/
platform
/
external
/
jackson-core
/
1fa0a70cd2da80c4315fa45e59cf3ecd25e98ece
/
.
/
.gitattributes
blob: 4cf2927d3ac5db4059780c8c348546bf2fa1a42c [
file
] [
log
] [
blame
]
Tatu Saloranta
804f376
2016-02-03 18:57:37 -0800
[
diff
] [
blame
]
1
# Do not merge `pom.xml` from older version, as it will typically conflict
2
3
pom
.
xml merge
=
ours