Skip to content
Snippets Groups Projects
Commit fb5f4031 authored by Cameron Sparr's avatar Cameron Sparr
Browse files

update gitattributes for easier fork mngmnt

parent 52b9fc83
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 1 deletion
.gitattributes
+ 3
− 1
View file @ fb5f4031
CHANGELOG.md merge=union
README.md merge=union
plugins/inputs/all/all.go merge=union
plugins/outputs/all/all.go merge=union
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment