Use merge=union driver for go.sum

This commit is contained in:
Daniel Nelson
2020-03-16 10:02:49 -07:00
parent da9f19ca9d
commit 2a465cc687

1
.gitattributes vendored
View File

@@ -1,4 +1,5 @@
CHANGELOG.md merge=union
README.md merge=union
go.sum merge=union
plugins/inputs/all/all.go merge=union
plugins/outputs/all/all.go merge=union