chore: fix merge conflic

rob893 · Sep 7, 2021 · 070bda6 · 070bda6
2 parents 5b30ba8 + cf032a0
commit 070bda6
Showing 41 changed files with 2,366 additions and 1,282 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "typescript-extended-linq",
-  "version": "1.2.1",
+  "version": "1.3.1",
   "description": "Typescript Linq API",
   "author": "Robert Herber",
   "license": "MIT",
@@ -43,8 +43,8 @@
     "@stryker-mutator/typescript-checker": "^5.4.0",
     "@types/benchmark": "^2.1.1",
     "@types/jest": "^27.0.1",
-    "@typescript-eslint/eslint-plugin": "^4.30.0",
-    "@typescript-eslint/parser": "^4.30.0",
+    "@typescript-eslint/eslint-plugin": "^4.31.0",
+    "@typescript-eslint/parser": "^4.31.0",
     "benchmark": "^2.1.4",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",