From b17f449ad3a06482d61ee604a7d4eecb9e74f8fe Mon Sep 17 00:00:00 2001
From: David Taylor <tinystatemachine@gmail.com>
Date: Mon, 12 Dec 2016 20:25:17 +0000
Subject: [PATCH] mark generated css as binary in git

this prevents it from diffing or trying to merge changes in the generated map, since it should be re-generated via sass to handle merging.
---
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000000..d42fe827f3e
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+css/customstyles.css.map binary
+css/customstyles.css -merge