Skip to content

Commit 8ba73ae

Browse files
committed
docs(en): fix conflicts
1 parent aa75373 commit 8ba73ae

File tree

1 file changed

+5
-12
lines changed

1 file changed

+5
-12
lines changed

yarn.lock

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4241,7 +4241,7 @@ commander@^8.1.0:
42414241
resolved "https://registry.yarnpkg.com/commander/-/commander-8.2.0.tgz#37fe2bde301d87d47a53adeff8b5915db1381ca8"
42424242
integrity sha512-LLKxDvHeL91/8MIyTAD5BFMNtoIwztGPMiM/7Bl8rIPmHCZXRxmSWr91h57dpOpnQ6jIUqEWdXE/uBYMfiVZDA==
42434243

4244-
commander@^8.3.0, commander@~8.3.0:
4244+
commander@^8.3.0:
42454245
version "8.3.0"
42464246
resolved "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
42474247
integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
@@ -6131,10 +6131,10 @@ get-stdin@^5.0.1:
61316131
resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398"
61326132
integrity sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=
61336133

6134-
get-stdin@~8.0.0:
6135-
version "8.0.0"
6136-
resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53"
6137-
integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==
6134+
get-stdin@~9.0.0:
6135+
version "9.0.0"
6136+
resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-9.0.0.tgz#3983ff82e03d56f1b2ea0d3e60325f39d703a575"
6137+
integrity sha512-dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA==
61386138

61396139
get-stream@^5.0.0, get-stream@^5.1.0:
61406140
version "5.2.0"
@@ -8536,13 +8536,6 @@ markdownlint@^0.25.1, markdownlint@~0.25.1:
85368536
dependencies:
85378537
markdown-it "12.3.2"
85388538

8539-
markdownlint@~0.24.0:
8540-
version "0.24.0"
8541-
resolved "https://registry.yarnpkg.com/markdownlint/-/markdownlint-0.24.0.tgz#224b53f671367a237d40c8be1745c7be9a322671"
8542-
integrity sha512-OJIGsGFV/rC9irI5E1FMy6v9hdACSwaa+EN3224Y5KG8zj2EYzdHOw0pOJovIYmjNfEZ9BtxUY4P7uYHTSNnbQ==
8543-
dependencies:
8544-
markdown-it "12.2.0"
8545-
85468539
md5@^2.3.0:
85478540
version "2.3.0"
85488541
resolved "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz#c3da9a6aae3a30b46b7b0c349b87b110dc3bda4f"

0 commit comments

Comments
 (0)