Fix grammar

sbrannen · sbrannen · commit 717d03a29d95 · 2023-04-01T18:15:19.000+02:00
diff --git a/spring-core/src/main/java/org/springframework/core/io/support/PropertySourceProcessor.java b/spring-core/src/main/java/org/springframework/core/io/support/PropertySourceProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@
 /**
  * Contribute {@link PropertySource property sources} to the {@link Environment}.
  *
- * <p>This class is stateful and merge descriptors with the same name in a
+ * <p>This class is stateful and merges descriptors with the same name in a
  * single {@link PropertySource} rather than creating dedicated ones.
  *
  * @author Stephane Nicoll

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2022 the original author or authors.`
	`2`	`+ * Copyright 2002-2023 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -40,7 +40,7 @@`
`40`	`40`	`/**`
`41`	`41`	`* Contribute {@link PropertySource property sources} to the {@link Environment}.`
`42`	`42`	`*`
`43`		`- * <p>This class is stateful and merge descriptors with the same name in a`
	`43`	`+ * <p>This class is stateful and merges descriptors with the same name in a`
`44`	`44`	`* single {@link PropertySource} rather than creating dedicated ones.`
`45`	`45`	`*`
`46`	`46`	`* @author Stephane Nicoll`