From b94d406bd9991fea74b9a2244a3a110a4174e391 Mon Sep 17 00:00:00 2001
From: Winston Chang <winston@stdout.org>
Date: Thu, 23 Apr 2015 11:52:22 -0500
Subject: [PATCH] Treat shiny.js as binary

---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitattributes b/.gitattributes
index 403e433498..20e4efd4cd 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,4 @@
 /NEWS merge=union
+/inst/www/shared/shiny.js -merge -diff
 *.min.js -merge -diff
 *.js.map -merge -diff