Commit a0d9a55

authored

Merge pull request #307 from Sh3Rm4n/merge-union

Set merge=union Git attribute for CHANGELOG.md

2 parents 81940e7 + a18c79f commit a0d9a55Copy full SHA for a0d9a55

1 file changed

+1

-0

lines changed

.gitattributes

1 file changed

+1

-0

lines changed

`‎.gitattributes`

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

Comments

(0)