# Conflicts: # backend/src/main/java/ru/micord/ervu/kafka/ReplyingKafkaConfig.java # config/patches/default.cli # config/standalone/dev/standalone.xml # frontend/src/ts/modules/app/app.module.ts # pom.xml # resources/src/main/resources/business-model/LK RP FL/mydata.page # resources/src/main/resources/business-model/LK RP FL/screen-form-fl.page |
||
|---|---|---|
| .. | ||
| standalone.xml | ||