From 7b266ad50fdfc731bacca3d7074ded0c3bdfdfc0 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Fri, 10 Feb 2017 23:50:56 -0500 Subject: [PATCH] .gitattributes Update Don't consider them binaries anymore, since we're using mapmerge. --- .gitattributes | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitattributes b/.gitattributes index 6f4a2810a2..5e9dfae55f 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