# Do not merge `pom.xml` from older version, as it will typically conflict

pom.xml merge=ours
.travis.yml merge=ours

release/VERSION merge=ours
