File tree Expand file tree Collapse file tree 1 file changed +7
-3
lines changed Expand file tree Collapse file tree 1 file changed +7
-3
lines changed Original file line number Diff line number Diff line change @@ -1068,6 +1068,7 @@ core-util-is@~1.0.0:
10681068 resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
10691069 integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
10701070
1071+ <<<<<<< HEAD
10711072<<<<<<< HEAD
10721073cross-spawn@^7.0.0, cross-spawn@^7.0.5 :
10731074<<<<<<< HEAD
10961097=======
10971098=======
10981099cross-spawn@^7.0.6 :
1100+ =======
1101+ cross-spawn@^7.0.0, cross-spawn@^7.0.6 :
1102+ >>>>>>> 3a3cbf1 (Update dependency glob to v11.0.1 (#384))
10991103 version "7.0.6"
11001104 resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
11011105 integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
@@ -1736,9 +1740,9 @@ glob-parent@~5.1.2:
17361740 is-glob "^4.0.1"
17371741
17381742glob@11, glob@^11.0.0 :
1739- version "11.0.0 "
1740- resolved "https://registry.yarnpkg.com/glob/-/glob-11.0.0 .tgz#6031df0d7b65eaa1ccb9b29b5ced16cea658e77e "
1741- integrity sha512-9UiX/Bl6J2yaBbxKoEBRm4Cipxgok8kQYcOPEhScPwebu2I0HoQOuYdIO6S3hLuWoZgpDpwQZMzTFxgpkyT76g ==
1743+ version "11.0.1 "
1744+ resolved "https://registry.yarnpkg.com/glob/-/glob-11.0.1 .tgz#1c3aef9a59d680e611b53dcd24bb8639cef064d9 "
1745+ integrity sha512-zrQDm8XPnYEKawJScsnM0QzobJxlT/kHOOlRTio8IH/GrmxRE5fjllkzdaHclIuNjUQTJYH2xHNIGfdpJkDJUw ==
17421746 dependencies :
17431747 foreground-child "^3.1.0"
17441748 jackspeak "^4.0.1"
You can’t perform that action at this time.
0 commit comments