Use union merge strategy on changelog (#859)

This commit is contained in:

Joe Nelson

2017-04-08 10:36:02 -05:00

committed by

GitHub

parent 8557ee55f5

commit 3e7a8b5f85

1 changed files with 1 additions and 0 deletions

.gitattributes

View File

		`@@ -0,0 +1 @@`
							`/CHANGELOG.md merge=union`