Skip to content

Commit 2da1634

Browse files
committed
resolved conflict
1 parent e5af3f1 commit 2da1634

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

guide/rolldown.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -345,8 +345,4 @@ const plugin = {
345345
}
346346
```
347347

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) 并且除非指定,否则从扩展名推断模块类型。

0 commit comments

Comments
 (0)