Revert "ignore a file that always clutters status on OS X (no known fix)"
[ikiwiki.git] / .gitattributes
1 debian/changelog merge=dpkg-mergechangelogs