resolved conflict

thinkasany · thinkasany · commit 2da1634b58ec · 2025-10-24T08:14:28.000+08:00
diff --git a/guide/rolldown.md b/guide/rolldown.md
@@ -345,8 +345,4 @@ const plugin = {
 }
 ```
 
-<<<<<<< HEAD
-这是因为 [Rolldown 支持非 JavaScript 模块](https://rolldown.rs/guide/in-depth/module-types) 并且除非指定，否则从扩展名推断模块类型。
-=======
-This is because [Rolldown supports non-JavaScript modules](https://rolldown.rs/in-depth/module-types) and infers the module type from extensions unless specified.
->>>>>>> a4d9e4f3fd639e07828651de2315aa5dcdeb6fa4
+这是因为 [Rolldown 支持非 JavaScript 模块](https://rolldown.rs/in-depth/module-types) 并且除非指定，否则从扩展名推断模块类型。

Original file line number	Diff line number	Diff line change
`@@ -345,8 +345,4 @@ const plugin = {`
`345`	`345`	`}`
`346`	`346`	```
`347`	`347`
`348`		`-<<<<<<< HEAD`
`349`		`-这是因为 [Rolldown 支持非 JavaScript 模块](https://rolldown.rs/guide/in-depth/module-types) 并且除非指定，否则从扩展名推断模块类型。`
`350`		`-=======`
`351`		`-This is because [Rolldown supports non-JavaScript modules](https://rolldown.rs/in-depth/module-types) and infers the module type from extensions unless specified.`
`352`		`->>>>>>> a4d9e4f3fd639e07828651de2315aa5dcdeb6fa4`
	`348`	`+这是因为 [Rolldown 支持非 JavaScript 模块](https://rolldown.rs/in-depth/module-types) 并且除非指定，否则从扩展名推断模块类型。`