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