Skip to content

Commit 94c55b0

Browse files
committed
chore: restore version to ease conflicts
1 parent 68d6500 commit 94c55b0

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

.github/workflows/run-e2e-tests.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,8 @@ jobs:
2828
packages/parameters,
2929
packages/idempotency,
3030
]
31-
<<<<<<< HEAD
32-
version: [14, 16, 18]
33-
arch: [x86_64, arm64]
34-
=======
3531
version: [16, 18]
36-
>>>>>>> 878dccda (chore(maintenance): bump dependencies & drop nodejs14x (#1687))
32+
arch: [x86_64, arm64]
3733
fail-fast: false
3834
steps:
3935
- name: Checkout Repo

docs/snippets/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "docs",
3-
"version": "2.0.0",
3+
"version": "1.13.1",
44
"description": "A collection code snippets for the Powertools for AWS Lambda (TypeScript) docs",
55
"author": {
66
"name": "Amazon Web Services",

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)