chore(package.json): fix package.json conflict

softrams · Nov 23, 2020 · d3ace4e · d3ace4e
2 parents 7cfeb91 + 72ee09f
commit d3ace4e
Show file tree

Hide file tree

Showing 4 changed files with 117 additions and 105 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -23,12 +23,12 @@
     "@angular/platform-browser": "~11.0.0",
     "@angular/platform-browser-dynamic": "~11.0.0",
     "@angular/router": "~11.0.0",
-    "@ng-select/ng-select": "^5.0.8",
+    "@ng-select/ng-select": "^5.0.9",
     "chart.js": "^2.9.4",
     "core-js": "^3.7.0",
     "ngx-markdown": "^10.1.1",
     "primeflex": "^2.0.0",
-    "primeicons": "^4.0.0",
+    "primeicons": "^4.1.0",
     "primeng": "^10.0.3",
     "rxjs": "~6.6.3",
     "tslib": "^2.0.0",
@@ -37,10 +37,10 @@
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "~0.1100.1",
-    "@angular/language-service": "~11.0.0",
-    "@types/jasmine": "~3.6.0",
+    "@angular/language-service": "~11.0.2",
+    "@types/jasmine": "~3.6.2",
     "@types/jasminewd2": "~2.0.3",
-    "@types/node": "^14.14.8",
+    "@types/node": "^14.14.9",
     "codelyzer": "^6.0.0",
     "jasmine-core": "~3.6.0",
     "jasmine-spec-reporter": "~5.0.0",