From b9fee7f86361f6a7aac44927441648530c8e6540 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Mon, 14 Jan 2019 19:01:39 +0100 Subject: [PATCH] fix merge error --- .../cloud/stream/binder/tck/ContentTypeTckTests.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/tck/ContentTypeTckTests.java b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/tck/ContentTypeTckTests.java index 91095f385..bdfdda1e0 100644 --- a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/tck/ContentTypeTckTests.java +++ b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/tck/ContentTypeTckTests.java @@ -26,6 +26,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Test; import org.springframework.boot.WebApplicationType; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cloud.stream.annotation.EnableBinding; import org.springframework.cloud.stream.annotation.StreamListener; @@ -612,8 +613,6 @@ public class ContentTypeTckTests { @EnableBinding(Processor.class) @Import(TestChannelBinderConfiguration.class) -<<<<<<< HEAD -======= @EnableAutoConfiguration public static class TypelessToMessageStreamListener { @StreamListener(Processor.INPUT) @@ -637,7 +636,6 @@ public class ContentTypeTckTests { @EnableBinding(Processor.class) @Import(TestChannelBinderConfiguration.class) @EnableAutoConfiguration ->>>>>>> f6381d72... GH-1533 Fixed regression in ObjectStringMessageConverter public static class ByteArrayToByteArrayStreamListener { @StreamListener(Processor.INPUT) @SendTo(Processor.OUTPUT)