# Conflicts: # clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/config/KafkaTestConfig.java # clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/service/AbstractServiceTest.java |
||
|---|---|---|
| .. | ||
| main | ||
| test | ||
# Conflicts: # clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/config/KafkaTestConfig.java # clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/service/AbstractServiceTest.java |
||
|---|---|---|
| .. | ||
| main | ||
| test | ||