Merge branch '2.10'

cowtowncoder · cowtowncoder · commit 649e06fbe90b · 2019-05-05T13:36:33.000-07:00
diff --git a/src/test/java/com/fasterxml/jackson/datatype/joda/DateTimeTest.java b/src/test/java/com/fasterxml/jackson/datatype/joda/DateTimeTest.java
@@ -131,7 +131,7 @@ public void testCustomPatternStyle() throws IOException
         }
         assertEquals(aposToQuotes("{'date':'1/1/70 12:00 AM'}"), json);
     }
-    
+
     public void testSerializationWithTypeInfo() throws IOException
     {
         // let's use epoch time (Jan 1, 1970, UTC)

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ public void testCustomPatternStyle() throws IOException`
`131`	`131`	`}`
`132`	`132`	`assertEquals(aposToQuotes("{'date':'1/1/70 12:00 AM'}"), json);`
`133`	`133`	`}`
`134`		`-`
	`134`	`+`
`135`	`135`	`public void testSerializationWithTypeInfo() throws IOException`
`136`	`136`	`{`
`137`	`137`	`// let's use epoch time (Jan 1, 1970, UTC)`