From 86d2afe00714c7967569fc567c977a3039947fbf Mon Sep 17 00:00:00 2001
From: Cedric Champeau <cedric.champeau@gmail.com>
Date: Thu, 4 May 2023 09:26:23 +0200
Subject: [PATCH] Fix merge conflict

---
 settings.gradle | 1 -
 1 file changed, 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 1add53c4c..6b0f36416 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -62,7 +62,6 @@ include 'test-resources-client'
 include 'test-resources-elasticsearch'
 include 'test-resources-embedded'
 include 'test-resources-hivemq'
-include 'test-resources-junit5'
 include 'test-resources-kafka'
 include 'test-resources-mongodb'
 include 'test-resources-neo4j'