Skip to content

Commit

Permalink
Merge changelog entries with union merge.
Browse files Browse the repository at this point in the history
  • Loading branch information
Cornelius Riemenschneider committed Jul 23, 2018
1 parent 5b637c3 commit 566fede
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/CHANGELOG.rst merge=union

0 comments on commit 566fede

Please sign in to comment.