aboutsummaryrefslogtreecommitdiffstats
path: root/web/nms.gathering.org/old/speedometer/d3-master/.gitattributes
diff options
context:
space:
mode:
Diffstat (limited to 'web/nms.gathering.org/old/speedometer/d3-master/.gitattributes')
-rw-r--r--web/nms.gathering.org/old/speedometer/d3-master/.gitattributes5
1 files changed, 0 insertions, 5 deletions
diff --git a/web/nms.gathering.org/old/speedometer/d3-master/.gitattributes b/web/nms.gathering.org/old/speedometer/d3-master/.gitattributes
deleted file mode 100644
index aa9cd05..0000000
--- a/web/nms.gathering.org/old/speedometer/d3-master/.gitattributes
+++ /dev/null
@@ -1,5 +0,0 @@
-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