Skip to content

Commit 1605a9f

Browse files
committed
chore: solve merge conflicts
2 parents 516685c + bfce8a0 commit 1605a9f

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"glob": "13.0.4",
2727
"node-forge": "1.3.3",
2828
"js-yaml": "4.1.1",
29-
"tar": "7.5.7"
29+
"tar": "7.5.12"
3030
}
3131
}
3232
}

pnpm-lock.yaml

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)