fix conflicts

huiruan · huiruan · commit d64c25e2d0e7 · 2023-08-05T18:01:46.000+08:00
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;
   }

Original file line number	Diff line number	Diff line change
`@@ -528,7 +528,6 @@ public boolean isReplicationPeerModificationEnabled() {`
`528`	`528`	`}`
`529`	`529`
`530`	`530`	`@Override`
`531`		`-<<<<<<< HEAD`
`532`	`531`	`public ReplicationLogCleanerBarrier getReplicationLogCleanerBarrier() {`
`533`	`532`	`return null;`
`534`	`533`	`}`