Skip to content

Commit 717d03a

Browse files
committed
Fix grammar
1 parent 2b427ef commit 717d03a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

spring-core/src/main/java/org/springframework/core/io/support/PropertySourceProcessor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2022 the original author or authors.
2+
* Copyright 2002-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@
4040
/**
4141
* Contribute {@link PropertySource property sources} to the {@link Environment}.
4242
*
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
4444
* single {@link PropertySource} rather than creating dedicated ones.
4545
*
4646
* @author Stephane Nicoll

0 commit comments

Comments
 (0)