Skip to content

Commit

Permalink
update gitattributes for easier fork mngmnt
Browse files Browse the repository at this point in the history
  • Loading branch information
@sparrc
sparrc committed Jun 1, 2016
1 parent 52b9fc8 commit fb5f403
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion .gitattributes
View file
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit fb5f403

Please sign in to comment.