diff options
| author | adamhrv <adam@ahprojects.com> | 2019-03-14 15:09:44 +0100 |
|---|---|---|
| committer | adamhrv <adam@ahprojects.com> | 2019-03-14 15:09:44 +0100 |
| commit | df6db850a37d1a14a852b7932bef0c6bc5a2d27c (patch) | |
| tree | 0a85d6674598c936b20502a31fcb0c6ce2f82b86 /site/content/pages/about/credits.md | |
| parent | f1ceb3953fae55a06c94a058f90ed278cf0240f5 (diff) | |
| parent | c826165945096a90902bb7a31db72eb0670ab388 (diff) | |
Merge branch 'master' of github.com:adamhrv/megapixels_dev
Diffstat (limited to 'site/content/pages/about/credits.md')
| -rw-r--r-- | site/content/pages/about/credits.md | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/site/content/pages/about/credits.md b/site/content/pages/about/credits.md index d4021d44..bc2283fd 100644 --- a/site/content/pages/about/credits.md +++ b/site/content/pages/about/credits.md @@ -34,8 +34,13 @@ authors: Adam Harvey #### Code +<<<<<<< HEAD +- This site uses D3.js, C3.js, and ThreeJS for visualizations. +- Data aggregation uses Pandas and PDFMiner.Six. +======= - This site uses D3 and C2 for visuzations - Add more here +>>>>>>> 26646e6adf3833f6282e9515c14ad61e485440c0 #### Data |