# Conflicts: # src/constant/theme.ts resolved by xingyy version # src/main.ts resolved by xingyy version # uno.config.ts resolved by xingyy version