docs(en): fix conflicts

Author: jacob-lcs

src/content/api/module-variables.mdx

@@ -169,23 +169,19 @@ import('./module-a').then((moduleA) => {
 });
 ```
 
-<<<<<<< HEAD
-## \_\_webpack_modules\_\_ (webpack-specific) $#__webpack_modules__-webpack-specific$
-=======
-## \_\_webpack_module\_\_ (webpack-specific)
+## \_\_webpack_module\_\_ (webpack-specific) $#__webpack_module__-webpack-specific$
 
 <Badge text="5.68.0+" />
 
-It provides access to the the current `module`. `module` is not available in strict ESM.
+它提供对当前 `module` 的访问。`module` 在 ESM 严格模式下不可用。
 
-## \_\_webpack_module\_\_.id (webpack-specific)
+## \_\_webpack_module\_\_.id (webpack-specific) $#__webpack_module__id-webpack-specific$
 
 <Badge text="5.68.0+" />
 
-It provides access to the ID of current `module` (`module.id`). `module` is not available in strict ESM.
+它提供对当前 `module`(`module.id`) ID 的访问。`module` 在 ESM 严格模式下不可用。
 
-## \_\_webpack_modules\_\_ (webpack-specific)
->>>>>>> 0462e9b4100e33f9d1fd6b1b8730bf51369a4ea4
+## \_\_webpack_modules\_\_ (webpack-specific) $#__webpack_modules__-webpack-specific$
 
 访问所有模块的内部对象。
 

src/content/concepts/index.mdx

@@ -139,13 +139,8 @@ T> 查看 [插件接口(plugin interface)](/api/plugins)，学习如何使用它
 **webpack.config.js**
 
 ```javascript
-<<<<<<< HEAD
-const HtmlWebpackPlugin = require('html-webpack-plugin'); // 通过 npm 安装
-const webpack = require('webpack'); // 用于访问内置插件
-=======
 const HtmlWebpackPlugin = require('html-webpack-plugin');
-const webpack = require('webpack'); //to access built-in plugins
->>>>>>> 0462e9b4100e33f9d1fd6b1b8730bf51369a4ea4
+const webpack = require('webpack'); // 用于访问内置插件
 
 module.exports = {
   module: {

src/content/concepts/loaders.mdx

@@ -53,13 +53,9 @@ module.exports = {
 - [配置方式](#configuration)（推荐）：在 **webpack.config.js** 文件中指定 loader。
 - [内联方式](#inline)：在每个 `import` 语句中显式指定 loader。
 
-<<<<<<< HEAD
-### 配置方式 $#configuration$
-=======
-Note that loaders can be used from CLI under webpack v4, but the feature was deprecated in webpack v5.
+注意在 webpack v4 版本可以通过 CLI 使用 loader，但是在 webpack v5 中被弃用。
 
-### Configuration
->>>>>>> 0462e9b4100e33f9d1fd6b1b8730bf51369a4ea4
+### Configuration $#configuration$
 
 [`module.rules`](/configuration/module/#modulerules) 允许你在 webpack 配置中指定多个 loader。
 这种方式是展示 loader 的一种简明方式，并且有助于使代码变得简洁和易于维护。同时让你对各个 loader 有个全局概览：

src/content/concepts/plugins.mdx

@@ -55,13 +55,8 @@ compiler hook 的 tap 方法的第一个参数，应该是驼峰式命名的插
 **webpack.config.js**
 
 ```javascript
-<<<<<<< HEAD
-const HtmlWebpackPlugin = require('html-webpack-plugin'); // 通过 npm 安装
-const webpack = require('webpack'); // 访问内置的插件
-=======
 const HtmlWebpackPlugin = require('html-webpack-plugin');
-const webpack = require('webpack'); //to access built-in plugins
->>>>>>> 0462e9b4100e33f9d1fd6b1b8730bf51369a4ea4
+const webpack = require('webpack'); // 访问内置的插件
 const path = require('path');
 
 module.exports = {

src/content/configuration/output.mdx

@@ -681,11 +681,7 @@ module.exports = {
 
 `string = 'hex'`
 
-<<<<<<< HEAD
-在生成 hash 时使用的编码方式。支持 Node.js [`hash.digest`](https://nodejs.org/api/crypto.html#crypto_hash_digest_encoding) 的所有编码。对文件名使用 `'base64'`，可能会出现问题，因为 base64 字母表中具有 `/` 这个字符(character)。同样的，`'latin1'` 规定可以含有任何字符(character)。
-=======
-The encoding to use when generating the hash. All encodings from Node.JS' [`hash.digest`](https://nodejs.org/api/buffer.html#buffers-and-character-encodings) are supported. Using `'base64'` for filenames might be problematic since it has the character `/` in its alphabet. Likewise `'latin1'` could contain any character.
->>>>>>> 0462e9b4100e33f9d1fd6b1b8730bf51369a4ea4
+在生成 hash 时使用的编码方式。支持 Node.js [`hash.digest`](https://nodejs.org/api/buffer.html#buffers-and-character-encodings) 的所有编码。对文件名使用 `'base64'`，可能会出现问题，因为 base64 字母表中具有 `/` 这个字符(character)。同样的，`'latin1'` 规定可以含有任何字符(character)。
 
 ## output.hashDigestLength $#outputhashdigestlength$
 
@@ -974,13 +970,9 @@ MyLibrary = _entry_return_;
 
 请注意，如果 `MyLibrary` 没有在你的库之前定义，那么它将会被设置在全局作用域。
 
-<<<<<<< HEAD
-##### type: 'assign-properties' <Badge text='5.16.0+' /> $#typeassignproperties$
-=======
-##### type: 'assign-properties'
+##### type: 'assign-properties' $#typeassignproperties$
 
 <Badge text="5.16.0+" />
->>>>>>> 0462e9b4100e33f9d1fd6b1b8730bf51369a4ea4
 
 ```js
 module.exports = {
@@ -1630,13 +1622,9 @@ MyLibrary = _entry_return_;
 
 注意，如果 `MyLibrary` 在作用域中未在前面代码进行定义，则你的 library 将被设置在全局作用域内。
 
-<<<<<<< HEAD
-#### libraryTarget: 'assign-properties' <Badge text='5.16.0+' /> $#libraryTarget-assign-properties$
-=======
-#### libraryTarget: 'assign-properties'
+#### libraryTarget: 'assign-properties' $#libraryTarget-assign-properties$
 
 <Badge text="5.16.0+" />
->>>>>>> 0462e9b4100e33f9d1fd6b1b8730bf51369a4ea4
 
 W> 最好使用 [output.library.type: 'assign-properties'`](#type-assign-properties)。
 

yarn.lock

@@ -5900,21 +5900,12 @@ find-cache-dir@^3.3.1:
     make-dir "^3.0.2"
     pkg-dir "^4.1.0"
 
-<<<<<<< HEAD
 find-up@^2.0.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
   integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
   dependencies:
     locate-path "^2.0.0"
-=======
-find-replace@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-replace/-/find-replace-3.0.0.tgz#3e7e23d3b05167a76f770c9fbd5258b0def68c38"
-  integrity sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==
-  dependencies:
-    array-back "^3.0.1"
->>>>>>> 0462e9b4100e33f9d1fd6b1b8730bf51369a4ea4
 
 find-up@^4.0.0, find-up@^4.1.0:
   version "4.1.0"
@@ -9295,7 +9286,6 @@ nano-css@^5.3.1:
     stacktrace-js "^2.0.2"
     stylis "^4.0.6"
 
-<<<<<<< HEAD
 nanocolors@^0.1.0, nanocolors@^0.1.5:
   version "0.1.12"
   resolved "https://registry.yarnpkg.com/nanocolors/-/nanocolors-0.1.12.tgz#8577482c58cbd7b5bb1681db4cf48f11a87fd5f6"
@@ -9305,12 +9295,6 @@ nanoid@^3.1.30:
   version "3.1.30"
   resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz#63f93cc548d2a113dc5dfbc63bfa09e2b9b64362"
   integrity sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==
-=======
-nanoid@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c"
-  integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==
->>>>>>> 0462e9b4100e33f9d1fd6b1b8730bf51369a4ea4
 
 natural-compare@^1.4.0:
   version "1.4.0"
@@ -12243,7 +12227,6 @@ synckit@^0.4.1:
     tslib "^2.3.1"
     uuid "^8.3.2"
 
-<<<<<<< HEAD
 table@^3.8.3:
   version "3.8.3"
   resolved "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f"
@@ -12260,22 +12243,6 @@ tailwindcss@^3.0.17:
   version "3.0.17"
   resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.0.17.tgz#2c5fe6c364d76ec54644347c6f09befe0113b06f"
   integrity sha512-OiHUsmOKQQEg/ocXaLIjk/kOz8EK2jF6iPuc1bQ4NsmhYl7sk70UDsGV02AJvBAAiJhinPCkDR8egT9qY+ulCw==
-=======
-table-layout@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/table-layout/-/table-layout-1.0.2.tgz#c4038a1853b0136d63365a734b6931cf4fad4a04"
-  integrity sha512-qd/R7n5rQTRFi+Zf2sk5XVVd9UQl6ZkduPFC3S7WEGJAmetDTjY3qPN50eSKzwuzEyQKy5TN2TiZdkIjos2L6A==
-  dependencies:
-    array-back "^4.0.1"
-    deep-extend "~0.6.0"
-    typical "^5.2.0"
-    wordwrapjs "^4.0.0"
-
-tailwindcss@^3.0.18:
-  version "3.0.18"
-  resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.0.18.tgz#ea4825e6496d77dc21877b6b61c7cc56cda3add5"
-  integrity sha512-ihPTpEyA5ANgZbwKlgrbfnzOp9R5vDHFWmqxB1PT8NwOGCOFVVMl+Ps1cQQ369acaqqf1BEF77roCwK0lvNmTw==
->>>>>>> 0462e9b4100e33f9d1fd6b1b8730bf51369a4ea4
   dependencies:
     arg "^5.0.1"
     chalk "^4.1.2"
@@ -12722,22 +12689,10 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
-<<<<<<< HEAD
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
-=======
-typical@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/typical/-/typical-4.0.0.tgz#cbeaff3b9d7ae1e2bbfaf5a4e6f11eccfde94fc4"
-  integrity sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==
-
-typical@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/typical/-/typical-5.2.0.tgz#4daaac4f2b5315460804f0acf6cb69c52bb93066"
-  integrity sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg==
->>>>>>> 0462e9b4100e33f9d1fd6b1b8730bf51369a4ea4
 
 uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"
@@ -13343,17 +13298,10 @@ webpack-cli@^4.9.2:
     rechoir "^0.7.0"
     webpack-merge "^5.7.3"
 
-<<<<<<< HEAD
 webpack-dev-middleware@^5.3.0:
   version "5.3.0"
   resolved "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.0.tgz#8fc02dba6e72e1d373eca361623d84610f27be7c"
   integrity sha512-MouJz+rXAm9B1OTOYaJnn6rtD/lWZPy2ufQCH3BPs8Rloh/Du6Jze4p7AeLYHkVi0giJnYLaSGDC7S+GM9arhg==
-=======
-webpack-dev-middleware@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.1.tgz#aa079a8dedd7e58bfeab358a9af7dab304cee57f"
-  integrity sha512-81EujCKkyles2wphtdrnPg/QqegC/AtqNH//mQkBYSMqwFVCQrxM6ktB2O/SPlZy7LqeEfTbV3cZARGQz6umhg==
->>>>>>> 0462e9b4100e33f9d1fd6b1b8730bf51369a4ea4
   dependencies:
     colorette "^2.0.10"
     memfs "^3.4.1"
@@ -13913,7 +13861,6 @@ ws@^7.3.1, ws@^7.4.5, ws@^7.4.6:
   resolved "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz#e59fc509fb15ddfb65487ee9765c5a51dec5fe7b"
   integrity sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==
 
-<<<<<<< HEAD
 ws@^8.1.0:
   version "8.4.0"
   resolved "https://registry.npmjs.org/ws/-/ws-8.4.0.tgz#f05e982a0a88c604080e8581576e2a063802bed6"
@@ -13923,12 +13870,6 @@ x-is-string@^0.1.0:
   version "0.1.0"
   resolved "https://registry.npmjs.org/x-is-string/-/x-is-string-0.1.0.tgz#474b50865af3a49a9c4657f05acd145458f77d82"
   integrity sha1-R0tQhlrzpJqcRlfwWs0UVFj3fYI=
-=======
-ws@^8.4.2:
-  version "8.4.2"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.4.2.tgz#18e749868d8439f2268368829042894b6907aa0b"
-  integrity sha512-Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA==
->>>>>>> 0462e9b4100e33f9d1fd6b1b8730bf51369a4ea4
 
 xhr@^2.0.1:
   version "2.6.0"