remove unnecessary codes

(cherry picked from commit 232f0ef)

Author: poorbarcode

pulsar-broker/src/main/java/org/apache/pulsar/client/api/RawReader.java

@@ -44,19 +44,6 @@ static CompletableFuture<RawReader> create(PulsarClient client, String topic, St
         return future.thenApply(__ -> r);
     }
 
-//<<<<<<< HEAD
-//=======
-//    static CompletableFuture<RawReader> create(PulsarClient client,
-//                                               ConsumerConfigurationData<byte[]> consumerConfiguration,
-//                                               boolean createTopicIfDoesNotExist, boolean retryOnRecoverableErrors) {
-//        CompletableFuture<Consumer<byte[]>> future = new CompletableFuture<>();
-//        RawReader r = new RawReaderImpl((PulsarClientImpl) client,
-//                consumerConfiguration, future, createTopicIfDoesNotExist, retryOnRecoverableErrors);
-//        return future.thenApply(__ -> r);
-//    }
-//
-//
-//>>>>>>> 37e160f78f ([fix][broker]Fix deadlock when compaction and topic deletion execute concurrently (#24366))
     /**
      * Get the topic for the reader.
      *

pulsar-broker/src/main/java/org/apache/pulsar/client/impl/RawReaderImpl.java

@@ -67,18 +67,6 @@ public RawReaderImpl(PulsarClientImpl client, String topic, String subscription,
                 retryOnRecoverableErrors);
     }
 
-//<<<<<<< HEAD
-//=======
-//    public RawReaderImpl(PulsarClientImpl client, ConsumerConfigurationData<byte[]> consumerConfiguration,
-//                         CompletableFuture<Consumer<byte[]>> consumerFuture,
-//                         boolean createTopicIfDoesNotExist, boolean retryOnRecoverableErrors) {
-//        this.consumerConfiguration = consumerConfiguration;
-//        consumer = new RawConsumerImpl(client, consumerConfiguration, consumerFuture, createTopicIfDoesNotExist,
-//                retryOnRecoverableErrors);
-//    }
-//
-//
-//>>>>>>> 37e160f78f ([fix][broker]Fix deadlock when compaction and topic deletion execute concurrently (#24366))
     @Override
     public String getTopic() {
         return consumerConfiguration.getTopicNames().stream()