chore: resolve conflict

This commit is contained in:
zhuzhengjian
2023-04-18 15:50:37 +08:00
6 changed files with 43 additions and 26 deletions

View File

@ -20,7 +20,6 @@ const genSharedButtonStyle: GenerateStyle<ButtonToken, CSSObject> = (
token
): CSSObject => {
const { componentCls, iconCls } = token
return {
[componentCls]: {
outline: 'none',