File tree 2 files changed +21
-0
lines changed
2 files changed +21
-0
lines changed Original file line number Diff line number Diff line change 25
25
"*.js" : " npm run lint-fix"
26
26
},
27
27
"devDependencies" : {
28
+ <<<<<<< HEAD
28
29
"@aws-lambda-powertools/commons" : " ^1.18.0" ,
29
30
"@aws-lambda-powertools/logger" : " ^1.18.0" ,
30
31
"@aws-lambda-powertools/metrics" : " ^1.18.0" ,
38
39
"aws-cdk" : " ^2.123.0" ,
39
40
"constructs" : " ^10.3.0" ,
40
41
"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))
41
56
"jest" : " ^29.7.0" ,
42
57
"ts-jest" : " ^29.1.2" ,
43
58
"ts-node" : " ^10.9.2" ,
Original file line number Diff line number Diff line change 21
21
"*.js" : " npm run lint-fix"
22
22
},
23
23
"devDependencies" : {
24
+ <<<<<<< HEAD
24
25
"@aws-sdk/client-dynamodb" : " ^3.499.0" ,
25
26
"@aws-sdk/client-ssm" : " ^3.499.0" ,
26
27
"@aws-sdk/lib-dynamodb" : " ^3.499.0" ,
27
28
"@types/aws-lambda" : " ^8.10.131" ,
28
29
"@types/jest" : " ^29.5.11" ,
29
30
"@types/node" : " ^20.11.7" ,
30
31
"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))
31
37
"jest" : " ^29.7.0" ,
32
38
"ts-jest" : " ^29.1.2" ,
33
39
"ts-node" : " ^10.9.2" ,
You can’t perform that action at this time.
0 commit comments