Skip to content

Commit c39b99c

Browse files
committed
yanr.lock
1 parent 323f92b commit c39b99c

File tree

1 file changed

+11
-36
lines changed

1 file changed

+11
-36
lines changed

yarn.lock

Lines changed: 11 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -6858,7 +6858,7 @@ __metadata:
68586858
languageName: node
68596859
linkType: hard
68606860

6861-
"async@npm:^3.2.0, async@npm:^3.2.2, async@npm:^3.2.3":
6861+
"async@npm:^3.2.0, async@npm:^3.2.2, async@npm:^3.2.3, async@npm:^3.2.6":
68626862
version: 3.2.6
68636863
resolution: "async@npm:3.2.6"
68646864
checksum: 10c0/36484bb15ceddf07078688d95e27076379cc2f87b10c03b6dd8a83e89475a3c8df5848859dd06a4c95af1e4c16fc973de0171a77f18ea00be899aca2a4f85e70
@@ -6911,8 +6911,7 @@ __metadata:
69116911
languageName: node
69126912
linkType: hard
69136913

6914-
<<<<<<< HEAD
6915-
"axios@npm:^1.11.0":
6914+
"axios@npm:^1.11.0, axios@npm:^1.8.3":
69166915
version: 1.11.0
69176916
resolution: "axios@npm:1.11.0"
69186917
dependencies:
@@ -6923,24 +6922,6 @@ __metadata:
69236922
languageName: node
69246923
linkType: hard
69256924

6926-
"axios@npm:^1.7.4":
6927-
version: 1.8.2
6928-
resolution: "axios@npm:1.8.2"
6929-
=======
6930-
"axios@npm:^1.8.2, axios@npm:^1.8.3":
6931-
version: 1.11.0
6932-
resolution: "axios@npm:1.11.0"
6933-
>>>>>>> 2e515c54 (yarn lock and package.json)
6934-
dependencies:
6935-
follow-redirects: "npm:^1.15.6"
6936-
form-data: "npm:^4.0.4"
6937-
proxy-from-env: "npm:^1.1.0"
6938-
checksum: 10c0/5de273d33d43058610e4d252f0963cc4f10714da0bfe872e8ef2cbc23c2c999acc300fd357b6bce0fc84a2ca9bd45740fa6bb28199ce2c1266c8b1a393f2b36e
6939-
languageName: node
6940-
linkType: hard
6941-
6942-
<<<<<<< HEAD
6943-
=======
69446925
"babel-core@npm:^7.0.0-bridge.0":
69456926
version: 7.0.0-bridge.0
69466927
resolution: "babel-core@npm:7.0.0-bridge.0"
@@ -6950,7 +6931,6 @@ __metadata:
69506931
languageName: node
69516932
linkType: hard
69526933

6953-
>>>>>>> 2e515c54 (yarn lock and package.json)
69546934
"babel-jest@npm:30.0.5":
69556935
version: 30.0.5
69566936
resolution: "babel-jest@npm:30.0.5"
@@ -7615,7 +7595,7 @@ __metadata:
76157595
languageName: node
76167596
linkType: hard
76177597

7618-
"chalk@npm:^4.0.0, chalk@npm:^4.0.2, chalk@npm:^4.1.0, chalk@npm:^4.1.1, chalk@npm:^4.1.2":
7598+
"chalk@npm:^4.0.0, chalk@npm:^4.1.0, chalk@npm:^4.1.1, chalk@npm:^4.1.2":
76197599
version: 4.1.2
76207600
resolution: "chalk@npm:4.1.2"
76217601
dependencies:
@@ -7626,9 +7606,9 @@ __metadata:
76267606
linkType: hard
76277607

76287608
"chalk@npm:^5.4.1":
7629-
version: 5.4.1
7630-
resolution: "chalk@npm:5.4.1"
7631-
checksum: 10c0/b23e88132c702f4855ca6d25cb5538b1114343e41472d5263ee8a37cccfccd9c4216d111e1097c6a27830407a1dc81fecdf2a56f2c63033d4dbbd88c10b0dcef
7609+
version: 5.5.0
7610+
resolution: "chalk@npm:5.5.0"
7611+
checksum: 10c0/23063b544f7c2fe57d25ff814807de561f8adfff72e4f0051051eaa606f772586470507ccd38d89166300eeaadb0164acde8bb8a0716a0f2d56ccdf3761d5e4f
76327612
languageName: node
76337613
linkType: hard
76347614

@@ -10783,11 +10763,7 @@ __metadata:
1078310763
languageName: node
1078410764
linkType: hard
1078510765

10786-
<<<<<<< HEAD
10787-
"form-data@npm:^4.0.0, form-data@npm:^4.0.4, form-data@npm:~4.0.4":
10788-
=======
1078910766
"form-data@npm:^4.0.4, form-data@npm:~4.0.4":
10790-
>>>>>>> 2e515c54 (yarn lock and package.json)
1079110767
version: 4.0.4
1079210768
resolution: "form-data@npm:4.0.4"
1079310769
dependencies:
@@ -12771,16 +12747,15 @@ __metadata:
1277112747
linkType: hard
1277212748

1277312749
"jake@npm:^10.8.5":
12774-
version: 10.9.2
12775-
resolution: "jake@npm:10.9.2"
12750+
version: 10.9.4
12751+
resolution: "jake@npm:10.9.4"
1277612752
dependencies:
12777-
async: "npm:^3.2.3"
12778-
chalk: "npm:^4.0.2"
12753+
async: "npm:^3.2.6"
1277912754
filelist: "npm:^1.0.4"
12780-
minimatch: "npm:^3.1.2"
12755+
picocolors: "npm:^1.1.1"
1278112756
bin:
1278212757
jake: bin/cli.js
12783-
checksum: 10c0/c4597b5ed9b6a908252feab296485a4f87cba9e26d6c20e0ca144fb69e0c40203d34a2efddb33b3d297b8bd59605e6c1f44f6221ca1e10e69175ecbf3ff5fe31
12758+
checksum: 10c0/bb52f000340d4a32f1a3893b9abe56ef2b77c25da4dbf2c0c874a8159d082dddda50a5ad10e26060198bd645b928ba8dba3b362710f46a247e335321188c5a9c
1278412759
languageName: node
1278512760
linkType: hard
1278612761

0 commit comments

Comments
 (0)