root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.1.x'

This commit is contained in:
Madhura Bhave 2019-04-15 17:10:07 -07:00
parent f206613b85 f0544fb86f
commit dabe75a281
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTestersAutoConfiguration.java
View File

@ -127,7 +127,6 @@ public class JsonTestersAutoConfiguration {
JsonTesterFactoryBean(Class<?> objectType, M marshaller) { JsonTesterFactoryBean(Class<?> objectType, M marshaller) {
this.objectType = objectType; this.objectType = objectType;
this.marshaller = marshaller; this.marshaller = marshaller;
} }
@Override @Override