fix conflicts

apache · Aug 5, 2023 · d64c25e · d64c25e
1 parent 2023557
commit d64c25e
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockNoopMasterServices.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockNoopMasterServices.java
@@ -528,7 +528,6 @@ public boolean isReplicationPeerModificationEnabled() {
   }
 
   @Override
-<<<<<<< HEAD
   public ReplicationLogCleanerBarrier getReplicationLogCleanerBarrier() {
     return null;
   }