| commit | 82837cc106559bb496e16ba792f216bcb692554c | [log] [tgz] |
|---|---|---|
| author | Tatu Saloranta <tatu.saloranta@iki.fi> | Fri Jan 29 22:31:15 2016 -0800 |
| committer | Tatu Saloranta <tatu.saloranta@iki.fi> | Fri Jan 29 22:31:15 2016 -0800 |
| tree | b522f5144644ecbd2ed7b2eb6fbcf906d89ddd85 | |
| parent | 58d18d4a64a5ff11989ee0659a46619dddff2381 [diff] |
try to prevent merge conflicts for pom.xml
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..4cf2927 --- /dev/null +++ b/.gitattributes
@@ -0,0 +1,3 @@ +# Do not merge `pom.xml` from older version, as it will typically conflict + +pom.xml merge=ours