fix: conflicts

FlowCrypt · May 14, 2024 · 882b0eb · 882b0eb
2 parents 42195d1 + 149bfaf
commit 882b0eb
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 72 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -13,8 +13,8 @@
     "@types/dompurify": "3.0.5",
     "@types/jquery": "3.5.30",
     "@types/mailparser": "3.4.4",
-    "@typescript-eslint/eslint-plugin": "7.8.0",
-    "@typescript-eslint/parser": "7.8.0",
+    "@typescript-eslint/eslint-plugin": "7.9.0",
+    "@typescript-eslint/parser": "7.9.0",
     "ava": "5.3.1",
     "chai": "4.4.1",
     "chai-as-promised": "7.1.2",