chore(): resolve conflicts

nestjs · Jul 7, 2021 · e1759a5 · e1759a5
2 parents a9d2b51 + a1481d5
commit e1759a5
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 20 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -77,7 +77,6 @@
     "@types/os-name": "3.1.0",
     "@types/rimraf": "3.0.0",
     "@types/shelljs": "0.8.9",
-    "@types/webpack": "5.28.0",
     "@types/webpack-node-externals": "2.5.2",
     "@typescript-eslint/eslint-plugin": "4.28.2",
     "@typescript-eslint/parser": "4.28.2",