chore(deps): update deps (wasedatime#117)

* chore(deps): update dependency ts-jest to v27.1.2 (wasedatime#115) Co-authored-by: Renovate Bot <[email protected]> * chore(deps): update dependency @types/node to v16.11.14 * chore(deps): update dependency typescript to v4.5.4 * chore(deps): update dependency jest to v27.4.5 (wasedatime#112) Co-authored-by: Renovate Bot <[email protected]> * chore(deps): update dependency @types/node to v16.11.16 (wasedatime#116) Co-authored-by: Renovate Bot <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Renovate Bot <[email protected]>
JasonNotJson · Feb 23, 2022 · f315dd3 · f315dd3
1 parent d8ed765
commit f315dd3
Show file tree

Hide file tree

Showing 2 changed files with 471 additions and 0 deletions.
diff --git a/package.json b/package.json
@@ -12,6 +12,7 @@
     "cdk": "cdk"
   },
   "devDependencies": {
+<<<<<<< HEAD
     "@aws-cdk/assert": "2.8.0",
     "@types/jest": "27.4.0",
     "@types/node": "16.11.25",
@@ -20,6 +21,16 @@
     "ts-jest": "27.1.3",
     "ts-node": "10.5.0",
     "typescript": "4.5.5"
+=======
+    "@aws-cdk/assert": "1.134.0",
+    "@types/jest": "27.0.3",
+    "@types/node": "16.11.16",
+    "aws-cdk": "1.134.0",
+    "jest": "27.4.5",
+    "ts-jest": "27.1.2",
+    "ts-node": "10.4.0",
+    "typescript": "4.5.4"
+>>>>>>> c00b3e1 (chore(deps): update deps (#117))
   },
   "dependencies": {
     "@aws-cdk/assets": "1.134.0",