dom
/
telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
No known key found for this signature in database
GPG Key ID: CAAD59C9444F6155
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

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