Skip to content

Commit 1f6256b

Browse files
committed
fix: resolved conflict
1 parent 15297d8 commit 1f6256b

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

config/shared-options.md

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -227,11 +227,7 @@ declare const __APP_VERSION__: string
227227
指定传递给 CSS 预处理器的选项。文件扩展名用作选项的键。每个预处理器支持的选项可以在它们各自的文档中找到:
228228

229229
- `sass`/`scss`:
230-
<<<<<<< HEAD
231-
- 选择要使用的 sass 应用程序接口 `api: "modern-compiler" | "modern"` (如果安装了`sass-embedded`,默认为`"modern-compiler"`,否则为 `"modern"`). 为获得最佳性能,建议使用 `api: "modern-compiler"``sass-embedded` 软件包。
232-
=======
233-
- Uses `sass-embedded` if installed, otherwise uses `sass`. For the best performance, it's recommended to install the `sass-embedded` package.
234-
>>>>>>> 500feca4bcc262767800a5f63ec9eef88fd38fed
230+
- 如果已安装,则使用 `sass-embedded`,否则使用 `sass`。为了获得最佳性能,建议安装 `sass-embedded` 包。
235231
- [Options](https://sass-lang.com/documentation/js-api/interfaces/stringoptions/)
236232
- `less`: [选项](https://lesscss.org/usage/#less-options).
237233
- `styl`/`stylus`: 仅支持 [`define`](https://stylus-lang.com/docs/js.html#define-name-node),可以作为对象传递。
@@ -251,10 +247,6 @@ export default defineConfig({
251247
},
252248
},
253249
scss: {
254-
<<<<<<< HEAD
255-
api: 'modern-compiler', // 或 "modern"
256-
=======
257-
>>>>>>> 500feca4bcc262767800a5f63ec9eef88fd38fed
258250
importers: [
259251
// ...
260252
],

0 commit comments

Comments
 (0)