Resolve conflicts by taking both changes

2017-04-04 15:13:01 -07:00 · 2017-04-04 15:13:01 -07:00 · d075dbdc11
parent 42ad7e407a
commit d075dbdc11
1 changed files with 1 additions and 0 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -0,0 +1 @@
+CHANGELOG.md merge=union