
# Conflicts: # app/src/main/java/ru/myitschool/work/data/UserRepositoryImpl.java # app/src/main/java/ru/myitschool/work/data/dto/UserDto.java # app/src/main/java/ru/myitschool/work/domain/entities/UserEntity.java
# Conflicts: # app/src/main/java/ru/myitschool/work/data/UserRepositoryImpl.java # app/src/main/java/ru/myitschool/work/data/dto/UserDto.java # app/src/main/java/ru/myitschool/work/domain/entities/UserEntity.java