From a0bcf757d7f02434ef4909b436fa9261c2b402b9 Mon Sep 17 00:00:00 2001
From: Naafiyan Ahmed <naafiyan@gmail.com>
Date: Tue, 12 Jul 2022 12:09:41 -0400
Subject: merged master

---
 package.json | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 87cd1c074..9f0d38e76 100644
--- a/package.json
+++ b/package.json
@@ -168,12 +168,7 @@
         "bootstrap": "^4.6.1",
         "browser-assert": "^1.2.1",
         "bson": "^4.6.1",
-<<<<<<< HEAD
-        "canvas": "^2.9.0",
-        "chart.js": "^3.8.0",
-=======
         "canvas": "^2.9.3",
->>>>>>> master
         "child_process": "^1.0.2",
         "chrome": "^0.1.0",
         "class-transformer": "^0.2.0",
-- 
cgit v1.2.3-70-g09d2