# Conflicts: # mobile-web/src/api/promotion.js # mobile-web/src/config/request.js |
||
|---|---|---|
| .. | ||
| user-application | ||
| user-sdk | ||
| user-service-api | ||
| user-service-impl | ||
| pom.xml | ||
# Conflicts: # mobile-web/src/api/promotion.js # mobile-web/src/config/request.js |
||
|---|---|---|
| .. | ||
| user-application | ||
| user-sdk | ||
| user-service-api | ||
| user-service-impl | ||
| pom.xml | ||