Skip to content

Commit deafcf4

Browse files
authored
docs(en): fix conflicts
1 parent 8c01c17 commit deafcf4

File tree

2 files changed

+2
-14
lines changed

2 files changed

+2
-14
lines changed

src/content/configuration/module.mdx

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -537,11 +537,7 @@ module.exports = {
537537

538538
`string`
539539

540-
<<<<<<< HEAD
541-
指定模块应放置在哪个 layer。
542-
=======
543-
Specify the layer in which the module should be placed in. A group of modules could be united in one layer which could then be used in [split chunks](/plugins/split-chunks-plugin/#splitchunkslayer), [stats](/configuration/stats/#statsgroupmodulesbylayer) or [entry options](/configuration/entry-context/#entry-descriptor).
544-
>>>>>>> de1b0e4b16826ae2a2e713ba2766a0a82b19b91e
540+
指定模块应放置在哪个 layer。一组模块可以统一在一个 layer 中,然后可以被用在 [split chunks](/plugins/split-chunks-plugin/#splitchunkslayer)[stats](/configuration/stats/#statsgroupmodulesbylayer) 或者 [entry options](/configuration/entry-context/#entry-descriptor)
545541

546542
**webpack.config.js**
547543

yarn.lock

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@
461461
dependencies:
462462
"@babel/types" "^7.18.6"
463463

464-
"@babel/helper-validator-identifier@^7.18.6":
464+
"@babel/helper-validator-identifier@^7.16.7", "@babel/helper-validator-identifier@^7.18.6":
465465
version "7.18.6"
466466
resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz#9c97e30d31b2b8c72a1d08984f2ca9b574d7a076"
467467
integrity sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==
@@ -12624,7 +12624,6 @@ text-table@^0.2.0:
1262412624
resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
1262512625
integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
1262612626

12627-
<<<<<<< HEAD
1262812627
textlint-rule-heading@^1.0.10:
1262912628
version "1.0.10"
1263012629
resolved "https://registry.yarnpkg.com/textlint-rule-heading/-/textlint-rule-heading-1.0.10.tgz#c0159ef0cb75e2ce3dca1ad08b73b03991ce2e23"
@@ -12667,13 +12666,6 @@ textlint@^11.8.2:
1266712666
try-resolve "^1.0.1"
1266812667
unique-concat "^0.2.2"
1266912668

12670-
throat@^6.0.1:
12671-
version "6.0.1"
12672-
resolved "https://registry.yarnpkg.com/throat/-/throat-6.0.1.tgz#d514fedad95740c12c2d7fc70ea863eb51ade375"
12673-
integrity sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==
12674-
12675-
=======
12676-
>>>>>>> de1b0e4b16826ae2a2e713ba2766a0a82b19b91e
1267712669
throttle-debounce@^3.0.1:
1267812670
version "3.0.1"
1267912671
resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-3.0.1.tgz#32f94d84dfa894f786c9a1f290e7a645b6a19abb"

0 commit comments

Comments
 (0)