[GitHub] flink pull request #5282: [FLINK-6352] [kafka] Timestamp-based offset config...

[aljoscha]

Github user aljoscha commented on a diff in the pull request:

    https://github.com/apache/flink/pull/5282#discussion_r170663674
  
    --- Diff: 
flink-connectors/flink-connector-kafka-0.10/src/test/java/org/apache/flink/streaming/connectors/kafka/internal/Kafka010FetcherTest.java
 ---
    @@ -129,9 +129,14 @@ public Void answer(InvocationOnMock invocation) {
                                schema,
                                new Properties(),
                                0L,
    +<<<<<<< HEAD
    --- End diff --
    
    Leftover merge markers?


---