docs(en): fix conflicts

docschina · Jul 17, 2022 · 9deb795 · 9deb795
1 parent 694cfce
commit 9deb795
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/src/content/configuration/resolve.mdx b/src/content/configuration/resolve.mdx
@@ -233,14 +233,11 @@ module.exports = {
 };
 ```
 
-<<<<<<< HEAD
-### resolve.extensions $#resolveextensions$
-=======
 ### resolve.extensionAlias
 
 `object`
 
-An object which maps extension to extension aliases.
+一个将拓展名与拓展名别名映射的对象。
 
 **webpack.config.js**
 
@@ -257,7 +254,6 @@ module.exports = {
 ```
 
 ### resolve.extensions
->>>>>>> 98a6bd0a7a9dca226bb68bfc45a53c19ac98ac37
 
 `[string] = ['.js', '.json', '.wasm']`