File tree Expand file tree Collapse file tree 2 files changed +21
-0
lines changed Expand file tree Collapse file tree 2 files changed +21
-0
lines changed Original file line number Diff line number Diff line change 2525 "*.js" : " npm run lint-fix"
2626 },
2727 "devDependencies" : {
28+ <<<<<<< HEAD
2829 "@aws-lambda-powertools/commons" : " ^1.18.0" ,
2930 "@aws-lambda-powertools/logger" : " ^1.18.0" ,
3031 "@aws-lambda-powertools/metrics" : " ^1.18.0" ,
3839 "aws-cdk" : " ^2.123.0" ,
3940 "constructs" : " ^10.3.0" ,
4041 "esbuild" : " ^0.19.12" ,
42+ =======
43+ "@aws-lambda-powertools/commons" : " ^1.17.0" ,
44+ "@aws-lambda-powertools/logger" : " ^1.17.0" ,
45+ "@aws-lambda-powertools/metrics" : " ^1.17.0" ,
46+ "@aws-lambda-powertools/parameters" : " ^1.17.0" ,
47+ "@aws-lambda-powertools/tracer" : " ^1.17.0" ,
48+ "@aws-sdk/client-ssm" : " ^3.413.0" ,
49+ "@aws-sdk/lib-dynamodb" : " ^3.413.0" ,
50+ "@types/aws-lambda" : " ^8.10.121" ,
51+ "@types/jest" : " ^29.5.4" ,
52+ "@types/node" : " 20.11.2" ,
53+ "aws-cdk" : " ^2.107.0" ,
54+ "esbuild" : " ^0.19.3" ,
55+ >>>>>>> c6e28dff (chore(deps-dev): bump @types/node from 20.11.0 to 20.11.2 (#1912))
4156 "jest" : " ^29.7.0" ,
4257 "ts-jest" : " ^29.1.2" ,
4358 "ts-node" : " ^10.9.2" ,
Original file line number Diff line number Diff line change 2121 "*.js" : " npm run lint-fix"
2222 },
2323 "devDependencies" : {
24+ <<<<<<< HEAD
2425 "@aws-sdk/client-dynamodb" : " ^3.499.0" ,
2526 "@aws-sdk/client-ssm" : " ^3.499.0" ,
2627 "@aws-sdk/lib-dynamodb" : " ^3.499.0" ,
2728 "@types/aws-lambda" : " ^8.10.131" ,
2829 "@types/jest" : " ^29.5.11" ,
2930 "@types/node" : " ^20.11.7" ,
3031 "esbuild" : " ^0.19.12" ,
32+ =======
33+ "@types/aws-lambda" : " ^8.10.121" ,
34+ "@types/jest" : " ^29.5.4" ,
35+ "@types/node" : " 20.11.2" ,
36+ >>>>>>> c6e28dff (chore(deps-dev): bump @types/node from 20.11.0 to 20.11.2 (#1912))
3137 "jest" : " ^29.7.0" ,
3238 "ts-jest" : " ^29.1.2" ,
3339 "ts-node" : " ^10.9.2" ,
You can’t perform that action at this time.
0 commit comments