diff options
| -rw-r--r-- | package.json | 5 |
1 files changed, 0 insertions, 5 deletions
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", |