Merge branch '6.0.x'

2023-06-09 10:30:16 +02:00
parent ef2b47e202 ea9c0ae6c0
commit dbd32f8f11
1 changed files with 1 additions and 1 deletions
--- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/QualifierConfiguration.java
+++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/QualifierConfiguration.java
@@ -45,7 +45,7 @@ public class QualifierConfiguration {
 		@Bean
 		@Qualifier("2")
 		public String two() {
-			return "one";
+			return "two";
 		}

 	}