From c96d58a90986e2e8271aa7fcfee474493fed5523 Mon Sep 17 00:00:00 2001
From: Bernardo Botella Corbi <contacto@bernardobotella.com>
Date: Wed, 12 Feb 2025 16:03:47 -0800
Subject: [PATCH] Fix rebase

---
 .../sidecar/testing/SharedClusterIntegrationTestBase.java    | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/integration-framework/src/main/java/org/apache/cassandra/sidecar/testing/SharedClusterIntegrationTestBase.java b/integration-framework/src/main/java/org/apache/cassandra/sidecar/testing/SharedClusterIntegrationTestBase.java
index 28ea20042..e63e19b32 100644
--- a/integration-framework/src/main/java/org/apache/cassandra/sidecar/testing/SharedClusterIntegrationTestBase.java
+++ b/integration-framework/src/main/java/org/apache/cassandra/sidecar/testing/SharedClusterIntegrationTestBase.java
@@ -168,16 +168,11 @@ public abstract class SharedClusterIntegrationTestBase
     protected Server server;
     protected TestVersion testVersion;
     protected MtlsTestHelper mtlsTestHelper;
-<<<<<<< HEAD
     private final CountDownLatch sidecarSchemaReadyLatch = new CountDownLatch(1);
     private IsolatedDTestClassLoaderWrapper classLoaderWrapper;
     private Injector sidecarServerInjector;
-=======
-    protected IsolatedDTestClassLoaderWrapper classLoaderWrapper;
-    protected Injector sidecarServerInjector;
     protected HashMap<Server, String> serverDeploymentIds;
     protected HashMap<Server, SidecarPeerHealthMonitorTask> peerHealthMonitors;
->>>>>>> 50d464dc (Refactor and improvements)
 
     static
     {