...

cowtowncoder · cowtowncoder · commit 6c52e2381613 · 2016-04-04T21:06:20.000-07:00
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

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+# Do not merge `pom.xml` from older version, as it will typically conflict
	`2`	`+`
	`3`	`+pom.xml merge=ours`