Rebase onto master

eslint · Jun 25, 2021 · 7b66408 · 7b66408
1 parent 9acd1c2
commit 7b66408
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -116,13 +116,8 @@
     "markdownlint": "^0.19.0",
     "markdownlint-cli": "^0.22.0",
     "memfs": "^3.0.1",
-<<<<<<< HEAD
     "mocha": "^8.3.2",
     "mocha-junit-reporter": "^2.0.0",
-=======
-    "mocha": "^7.2.0",
-    "mocha-junit-reporter": "^1.23.0",
->>>>>>> 1a6b3245b... Finish FlatConfigArray implementation
     "node-polyfill-webpack-plugin": "^1.0.3",
     "npm-license": "^0.3.3",
     "nyc": "^15.0.1",