summaryrefslogtreecommitdiff
path: root/site/content/pages/about/credits.md
diff options
context:
space:
mode:
Diffstat (limited to 'site/content/pages/about/credits.md')
-rw-r--r--site/content/pages/about/credits.md5
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