Adding .gitattributes for generated files.

2015-02-08 10:27:47 -08:00 · 2015-02-08 10:27:47 -08:00 · bc3571f77f
--- a/.gitattributes
+++ b/.gitattributes
@ -0,0 +1,5 @@
+bower.json -diff merge=ours
+component.json -diff merge=ours
+d3.js -diff merge=ours
+d3.min.js -diff merge=ours
+package.js -diff merge=ours