This reverts commit 39136d8295c7eb056f660694817874fa351d04a9
[ikiwiki.git] / .gitattributes
1 debian/changelog merge=dpkg-mergechangelogs