From 5f0cd37e82cbfc26549f2c3bb3040e5ebf7f55c4 Mon Sep 17 00:00:00 2001
From: patsonluk <patson@fullstory.com>
Date: Fri, 24 Nov 2023 13:25:32 -0800
Subject: [PATCH] Fixed merge conflict

---
 .../org/apache/solr/common/cloud/PerReplicaStatesOps.java   | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/PerReplicaStatesOps.java b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/PerReplicaStatesOps.java
index 9f40ef923ed..dd0b14fd3e1 100644
--- a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/PerReplicaStatesOps.java
+++ b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/PerReplicaStatesOps.java
@@ -379,10 +379,4 @@ List<PerReplicaStates.Operation> refresh(PerReplicaStates prs) {
   public String toString() {
     return ops.toString();
   }
-
-  public static class PrsZkNodeNotFoundException extends SolrException {
-    private PrsZkNodeNotFoundException(ErrorCode code, String msg, Throwable cause) {
-      super(code, msg, cause);
-    }
-  }
 }