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