# Conflicts: # backend/src/main/java/ru/micord/ervu/controller/ExtractController.java # backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java |
||
|---|---|---|
| .. | ||
| src/main/resources | ||
| pom.xml | ||
# Conflicts: # backend/src/main/java/ru/micord/ervu/controller/ExtractController.java # backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java |
||
|---|---|---|
| .. | ||
| src/main/resources | ||
| pom.xml | ||