From 25bf685a27d1aa6a4dcc6aff2148107b8cbde406 Mon Sep 17 00:00:00 2001
From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com>
Date: Wed, 14 Jun 2023 14:23:38 -0400
Subject: [PATCH] Fixing merge conflicts

---
 .../config/server/TransportConfigurationIntegrationTests.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/TransportConfigurationIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/TransportConfigurationIntegrationTests.java
index 25347b1e..e52b5293 100644
--- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/TransportConfigurationIntegrationTests.java
+++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/TransportConfigurationIntegrationTests.java
@@ -29,6 +29,7 @@ import org.eclipse.jgit.transport.SshTransport;
 import org.eclipse.jgit.transport.URIish;
 import org.eclipse.jgit.transport.sshd.SshdSessionFactory;
 import org.junit.jupiter.api.Test;
+import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -41,6 +42,7 @@ import org.springframework.cloud.config.server.ssh.PropertyBasedSshSessionFactor
 import org.springframework.cloud.config.server.ssh.SshPropertyValidator;
 import org.springframework.cloud.config.server.test.TestConfigServerApplication;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import static org.assertj.core.api.Assertions.assertThat;