diff options
| author | Nicolai Tellefsen <niccofyren@gmail.com> | 2016-03-21 20:33:44 +0100 |
|---|---|---|
| committer | Nicolai Tellefsen <niccofyren@gmail.com> | 2016-03-21 20:33:44 +0100 |
| commit | 5ba657e0bca0e4970b08583f6dfc94bfae34741c (patch) | |
| tree | 44ed77deecd40ca984aae4bfa1bb949cb87bf7a0 /web/nms-public.gathering.org/old/speedometer/d3-master/.gitattributes | |
| parent | d528cad67897dd2c3b98ec15a82868ac2764e2c7 (diff) | |
| parent | 727e4ab31aa6d1a754711d4cd29dbcefae2e952a (diff) | |
Merge branch 'master' of https://github.com/tech-server/tgmanage
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 |