summaryrefslogtreecommitdiff
path: root/.gitattributes
blob: 00e5815fd37a4240bb4fe3508af6bfb254eb3e6c (plain)
1
/CHANGES.rst merge=union