1# Do not merge `pom.xml` from older version, as it will typically conflict
2#
3# note: also need:
4# git config --global merge.ours.driver true
5# (and if ever need to disable change `true` to `false`
6
7pom.xml merge=ours
8