diff options
| author | Kristian Lyngstol <kly@kly@.no> | 2016-03-26 03:48:32 +0100 |
|---|---|---|
| committer | Kristian Lyngstol <kly@kly@.no> | 2016-03-26 03:48:32 +0100 |
| commit | cda4d1235486dc74c5d3630fc5e85307f277c5f3 (patch) | |
| tree | 0e59890e8afcf09024079d0e3a596e16b63250af /web/nms-public.gathering.org/old/speedometer/d3-master/.gitattributes | |
| parent | 004f4efcfd0779f4307b90fed139dc87d01ad0b9 (diff) | |
| parent | a791ca16c787672ea534dbde39f926d0341aa2e6 (diff) | |
Merge branch 'master' of 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 |