Merge branch '2.6'

Conflicts: pom.xml release-notes/VERSION
FasterXML · Apr 5, 2016 · 01ec8af · 01ec8af
2 parents 7775c4a + ed99527
commit 01ec8af
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,3 @@
+# Do not merge `pom.xml` from older version, as it will typically conflict
+
+pom.xml merge=ours