Git conflict code in ConsumerConfigurationTests.java - Githubissues

spring-projects / spring-integration-extensions

The Spring Integration Extensions project provides extension components for Spring Integration

http://www.springintegration.org/

281 stars 266 forks source link

Git conflict code in ConsumerConfigurationTests.java #192

Closed KrzysztofKarol closed 6 years ago

KrzysztofKarol commented 6 years ago

https://github.com/spring-projects/spring-integration-extensions/blob/e5703b5f9c353f7b711b6af4204a68a3a2f941e8/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/support/ConsumerConfigurationTests.java#L90