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