resolve merge conflict

yfx

2026-03-13 5414134d9358f675d0dd74587646afc065a949a9

1
2
3
4
5
6
7
@import './setting/_variables.scss';
@import './setting/_border.scss';
@import './setting/_color.scss';
@import './setting/_space.scss';
@import './setting/_radius.scss';
@import './setting/_text.scss';
@import './setting/_styles.scss';