From 75b551fa4b6e131914cfc913c52d56f39c38c96e Mon Sep 17 00:00:00 2001
From: Keith Turner <kturner@apache.org>
Date: Fri, 30 Aug 2024 00:29:59 +0000
Subject: [PATCH] fix merge problem

---
 .../main/java/org/apache/accumulo/test/CloseScannerIT.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/src/main/java/org/apache/accumulo/test/CloseScannerIT.java b/test/src/main/java/org/apache/accumulo/test/CloseScannerIT.java
index e22e3fc706d..6a4c4f68121 100644
--- a/test/src/main/java/org/apache/accumulo/test/CloseScannerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/CloseScannerIT.java
@@ -27,6 +27,7 @@
 import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.IsolatedScanner;
 import org.apache.accumulo.core.client.Scanner;
+import org.apache.accumulo.core.client.ScannerBase;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.security.Authorizations;
@@ -56,7 +57,8 @@ public void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuration hadoo
   }
 
   /**
-   * {@link org.apache.accumulo.test.functional.ScannerIT#testSessionCleanup()} is a similar test.
+   * {@link org.apache.accumulo.test.functional.ScannerIT#testSessionCleanup(ScannerBase.ConsistencyLevel)}
+   * is a similar test.
    */
   @Test
   public void testManyScans() throws Exception {