Skip to content

Commit f15a0b1

Browse files
Merge pull request #14 from api-platform/dependabot/npm_and_yarn/merge-1.2.1
2 parents e633aa9 + 582f265 commit f15a0b1

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

yarn.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2682,8 +2682,8 @@ [email protected]:
26822682
tmpl "1.0.x"
26832683

26842684
merge@^1.1.3:
2685-
version "1.2.0"
2686-
resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
2685+
version "1.2.1"
2686+
resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
26872687

26882688
micromatch@^2.1.5, micromatch@^2.3.11:
26892689
version "2.3.11"

0 commit comments

Comments
 (0)