diff --git a/.gitattributes b/.gitattributes index 6f4a2810a26..5e9dfae55f1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,9 +2,6 @@ # needs additional setup, see tools/mapmerge/install.txt # *.dmm merge=merge-dmm -# Nope, now they're binaries. -*.dmm binary - # dmi icon merger hook # needs additional setup, see tools/dmitool/merging.txt *.dmi merge=merge-dmi