Merge remote-tracking branch 'origin/snyk-upgrade-c412a28c40c0cae2065…

…493aa3835f296'
Karol-Witkowski · May 13, 2021 · f5c678e · f5c678e
2 parents b0b38a3 + c123b19
commit f5c678e
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/package.json b/package.json
@@ -18,10 +18,13 @@
     "axios": "^0.21.1",
     "canvas": "^2.6.1",
     "chart.js": "^2.9.4",
+<<<<<<< HEAD
 <<<<<<< HEAD
     "core-js": "^3.10.1",
     "css-loader": "^5.2.4",
 =======
+=======
+>>>>>>> snyk-upgrade-c412a28c40c0cae2065493aa3835f296
     "core-js": "^3.10.2",
     "css-loader": "^5.2.2",
 >>>>>>> snyk-upgrade-c412a28c40c0cae2065493aa3835f296