Merge pull request #1027 from Youmoo/patch-2

snicoll · snicoll · commit ad7285df0ba4 · 2016-04-04T17:36:36.000+02:00
* pr/1027:
  Fix typo
diff --git a/spring-context/src/main/java/org/springframework/format/annotation/DateTimeFormat.java b/spring-context/src/main/java/org/springframework/format/annotation/DateTimeFormat.java
@@ -41,7 +41,7 @@
  * <p>Each attribute is mutually exclusive, so only set one attribute per annotation instance
  * (the one most convenient one for your formatting needs).
  * When the pattern attribute is specified, it takes precedence over both the style and ISO attribute.
- * When the {@link #iso} attribute is specified, if takes precedence over the style attribute.
+ * When the {@link #iso} attribute is specified, it takes precedence over the style attribute.
  * When no annotation attributes are specified, the default format applied is style-based
  * with a style code of 'SS' (short date, short time).
  *

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@`
`41`	`41`	`* <p>Each attribute is mutually exclusive, so only set one attribute per annotation instance`
`42`	`42`	`* (the one most convenient one for your formatting needs).`
`43`	`43`	`* When the pattern attribute is specified, it takes precedence over both the style and ISO attribute.`
`44`		`- * When the {@link #iso} attribute is specified, if takes precedence over the style attribute.`
	`44`	`+ * When the {@link #iso} attribute is specified, it takes precedence over the style attribute.`
`45`	`45`	`* When no annotation attributes are specified, the default format applied is style-based`
`46`	`46`	`* with a style code of 'SS' (short date, short time).`
`47`	`47`	`*`