Commit 7f0ffa4

committed

Specify merge driver for changelog to avoid text conflicts

1 parent 8aae5ca commit 7f0ffa4Copy full SHA for 7f0ffa4

1 file changed

+1

-0

lines changed

.gitattributes

1 file changed

+1

-0

lines changed

`‎.gitattributes`

+1

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+/CHANGELOG.md merge=union`

Comments

(0)