From: Chris Rebert <github@rebertia.com>
Date: Tue, 17 Feb 2015 06:27:31 +0000 (-0800)
Subject: .gitattributes: treat source maps as binary files
X-Git-Tag: v3.3.4~117
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40961659acf84a8b0952f87e9a46462fac7a7e24;p=thirdparty%2Fbootstrap.git

.gitattributes: treat source maps as binary files
---

diff --git a/.gitattributes b/.gitattributes
index 0c55e2f594..f140503687 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -7,6 +7,8 @@
 *.md    text eol=lf
 *.svg   text eol=lf
 *.yml   text eol=lf
+# Don't diff or textually merge source maps
+*.map   binary
 
 bootstrap-theme.css linguist-vendored=false
 bootstrap.css linguist-vendored=false