From d64c25e2d0e794200c2c6288073c5e2dfdd91b36 Mon Sep 17 00:00:00 2001
From: huiruan <876107431@qq.com>
Date: Sat, 5 Aug 2023 17:57:59 +0800
Subject: [PATCH] fix conflicts

---
 .../org/apache/hadoop/hbase/master/MockNoopMasterServices.java   | 1 -
 1 file changed, 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
index c25de33f3302..a19b6ffbec64 100644
--- 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;
   }