From 8b85f92bf928337338e67086e5307288c8f7f5b3 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 4 Jun 2025 17:31:42 -0700 Subject: [PATCH] Fix merge conflict error --- .../r2dbc/ConnectionFactoryOptionsBuilderTests.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/r2dbc/ConnectionFactoryOptionsBuilderTests.java b/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/r2dbc/ConnectionFactoryOptionsBuilderTests.java index e5afaff98d..498cf534dd 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/r2dbc/ConnectionFactoryOptionsBuilderTests.java +++ b/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/r2dbc/ConnectionFactoryOptionsBuilderTests.java @@ -45,11 +45,7 @@ class ConnectionFactoryOptionsBuilderTests { @Test void createWhenDriverProtocolIsNullThrowsException() { assertThatIllegalArgumentException().isThrownBy(() -> new ConnectionFactoryOptionsBuilder(null, 123)) -<<<<<<< HEAD - .withMessage("'driverProtocol' must not be null"); -======= - .withMessage("Driver must not be null"); ->>>>>>> 3.4.x + .withMessage("'driver' must not be null"); } @Test