From 32138e349d074f8e9de77441eb0e03b29c9a61ac Mon Sep 17 00:00:00 2001
From: Matteo Merli <mmerli@apache.org>
Date: Tue, 20 Feb 2024 20:39:35 -0800
Subject: [PATCH] Fixed merge conflict

---
 .../java/org/apache/bookkeeper/conf/ClientConfiguration.java | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ClientConfiguration.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ClientConfiguration.java
index 4b6537bc628..03eb6d1abd9 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ClientConfiguration.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ClientConfiguration.java
@@ -2098,11 +2098,6 @@ public long getClientConnectBookieUnavailableLogThrottlingMs() {
         return getLong(CLIENT_CONNECT_BOOKIE_UNAVAILABLE_LOG_THROTTLING, 5_000L);
     }
 
-    public ClientConfiguration setBatchReadEnabled(boolean enable) {
-        setProperty(BATCH_READ_ENABLED, enable);
-        return this;
-    }
-
     public boolean isBatchReadEnabled() {
         return getBoolean(BATCH_READ_ENABLED, true);
     }