# Conflicts: # soul-admin/dist/assets/index-CbOmKBRd.js resolved by yongpxu-soul version # soul-admin/dist/index.html resolved by yongpxu-soul version # soul-api/.gitignore resolved by yongpxu-soul version