Use merge=union driver for go.sum
This commit is contained in:
1
.gitattributes
vendored
1
.gitattributes
vendored
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user