# Conflicts: # backend/src/main/java/ru/micord/ervu/kafka/service/impl/BaseReplyingKafkaServiceImpl.java # frontend/src/resources/app-config.json |
||
|---|---|---|
| .. | ||
| standalone.xml | ||
# Conflicts: # backend/src/main/java/ru/micord/ervu/kafka/service/impl/BaseReplyingKafkaServiceImpl.java # frontend/src/resources/app-config.json |
||
|---|---|---|
| .. | ||
| standalone.xml | ||