Skip to content

Commit d32b8f2

Browse files
committed
docs(en): fix conflicts
1 parent 0a32005 commit d32b8f2

File tree

1 file changed

+0
-47
lines changed

1 file changed

+0
-47
lines changed

yarn.lock

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -6300,7 +6300,6 @@ glob-to-regexp@^0.4.1:
63006300
resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
63016301
integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
63026302

6303-
<<<<<<< HEAD
63046303
glob@^7.0.3, glob@^7.0.5, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7:
63056304
version "7.1.7"
63066305
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
@@ -6313,21 +6312,6 @@ glob@^7.0.3, glob@^7.0.5, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7:
63136312
once "^1.3.0"
63146313
path-is-absolute "^1.0.0"
63156314

6316-
glob@~7.2.0:
6317-
=======
6318-
glob@^7.0.3, glob@^7.0.5, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
6319-
>>>>>>> 2b1aaf87f83d67c075fcbcfe3bdd76f0d3dc5d9f
6320-
version "7.2.0"
6321-
resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
6322-
integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
6323-
dependencies:
6324-
fs.realpath "^1.0.0"
6325-
inflight "^1.0.4"
6326-
inherits "2"
6327-
minimatch "^3.0.4"
6328-
once "^1.3.0"
6329-
path-is-absolute "^1.0.0"
6330-
63316315
glob@~8.0.3:
63326316
version "8.0.3"
63336317
resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e"
@@ -8467,7 +8451,6 @@ [email protected]:
84678451
dependencies:
84688452
tmpl "1.0.5"
84698453

8470-
<<<<<<< HEAD
84718454
map-like@^2.0.0:
84728455
version "2.0.0"
84738456
resolved "https://registry.npmjs.org/map-like/-/map-like-2.0.0.tgz#94496d49ad333c0dc3234b27adbbd1e8535953b4"
@@ -8478,19 +8461,6 @@ markdown-escapes@^1.0.0:
84788461
resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535"
84798462
integrity sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==
84808463

8481-
8482-
version "12.3.2"
8483-
resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.3.2.tgz#bf92ac92283fe983fe4de8ff8abfb5ad72cd0c90"
8484-
integrity sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==
8485-
dependencies:
8486-
argparse "^2.0.1"
8487-
entities "~2.1.0"
8488-
linkify-it "^3.0.1"
8489-
mdurl "^1.0.1"
8490-
uc.micro "^1.0.5"
8491-
8492-
=======
8493-
>>>>>>> 2b1aaf87f83d67c075fcbcfe3bdd76f0d3dc5d9f
84948464
84958465
version "13.0.1"
84968466
resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-13.0.1.tgz#c6ecc431cacf1a5da531423fc6a42807814af430"
@@ -8537,14 +8507,6 @@ markdownlint@^0.26.0, markdownlint@~0.26.0:
85378507
dependencies:
85388508
markdown-it "13.0.1"
85398509

8540-
<<<<<<< HEAD
8541-
markdownlint@~0.25.1:
8542-
version "0.25.1"
8543-
resolved "https://registry.yarnpkg.com/markdownlint/-/markdownlint-0.25.1.tgz#df04536607ebeeda5ccd5e4f38138823ed623788"
8544-
integrity sha512-AG7UkLzNa1fxiOv5B+owPsPhtM4D6DoODhsJgiaNg1xowXovrYgOnLqAgOOFQpWOlHFVQUzjMY5ypNNTeov92g==
8545-
dependencies:
8546-
markdown-it "12.3.2"
8547-
85488510
md5@^2.3.0:
85498511
version "2.3.0"
85508512
resolved "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz#c3da9a6aae3a30b46b7b0c349b87b110dc3bda4f"
@@ -8554,8 +8516,6 @@ md5@^2.3.0:
85548516
crypt "0.0.2"
85558517
is-buffer "~1.1.6"
85568518

8557-
=======
8558-
>>>>>>> 2b1aaf87f83d67c075fcbcfe3bdd76f0d3dc5d9f
85598519
mdast-squeeze-paragraphs@^4.0.0:
85608520
version "4.0.0"
85618521
resolved "https://registry.yarnpkg.com/mdast-squeeze-paragraphs/-/mdast-squeeze-paragraphs-4.0.0.tgz#7c4c114679c3bee27ef10b58e2e015be79f1ef97"
@@ -12537,17 +12497,10 @@ terser-webpack-plugin@^5.1.3:
1253712497
source-map "^0.6.1"
1253812498
terser "^5.7.0"
1253912499

12540-
<<<<<<< HEAD
1254112500
terser@^4.0.0, terser@^4.6.3:
1254212501
version "4.8.0"
1254312502
resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
1254412503
integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
12545-
=======
12546-
terser@^4.0.0:
12547-
version "4.8.1"
12548-
resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.1.tgz#a00e5634562de2239fd404c649051bf6fc21144f"
12549-
integrity sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==
12550-
>>>>>>> 2b1aaf87f83d67c075fcbcfe3bdd76f0d3dc5d9f
1255112504
dependencies:
1255212505
commander "^2.20.0"
1255312506
source-map "~0.6.1"

0 commit comments

Comments
 (0)