diff --git a/.gitattributes b/.gitattributes index 80edb3f0c4baada7244772d99f217bc1ae3505ac..276cc770936fd5f38cceb7dc94c9b83c8fc2dc49 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,4 @@ CHANGELOG.md merge=union - +README.md merge=union +plugins/inputs/all/all.go merge=union +plugins/outputs/all/all.go merge=union