Skip to content

Commit fb5f403

Browse files
sparrcsparrc
committed
update gitattributes for easier fork mngmnt
1 parent 52b9fc8 commit fb5f403

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

‎.gitattributes

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
CHANGELOG.md merge=union
2-
2+
README.md merge=union
3+
plugins/inputs/all/all.go merge=union
4+
plugins/outputs/all/all.go merge=union

0 commit comments

Comments
 (0)