diff --git a/template/.gitattributes b/template/.gitattributes new file mode 100644 index 0000000..3c15b1d --- /dev/null +++ b/template/.gitattributes @@ -0,0 +1 @@ +**/pom.xml merge=union \ No newline at end of file