Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict error

Browse Source
This commit is contained in:
Phillip Webb
2025-06-04 17:31:42 -07:00
parent b1b14d2c0c
commit 8b85f92bf9
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/r2dbc/ConnectionFactoryOptionsBuilderTests.java
View File

@@ -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