diff options
| author | Nicolai Tellefsen <niccofyren@gmail.com> | 2016-03-26 01:52:00 +0100 |
|---|---|---|
| committer | Nicolai Tellefsen <niccofyren@gmail.com> | 2016-03-26 01:52:00 +0100 |
| commit | a791ca16c787672ea534dbde39f926d0341aa2e6 (patch) | |
| tree | 2705d9bb008108fa01d491c438bebbfd574d1a8c /web/nms-public.gathering.org/old/speedometer/d3-master/.gitattributes | |
| parent | 7b39120d069223c5e2cf135f0e89df9a13ded17b (diff) | |
| parent | 851ac3e378bce07e06030ade4b9c12582fc21a3b (diff) | |
Merge branch 'master' of ssh://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, 0 insertions, 5 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 deleted file mode 100644 index aa9cd05..0000000 --- a/web/nms-public.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 |