Merge branch '1.3.x'

This commit is contained in:
Phillip Webb
2016-03-08 09:51:57 -08:00
4 changed files with 6 additions and 10 deletions

View File

@@ -192,6 +192,7 @@ public class DevToolsDataSourceAutoConfigurationTests {
public EntityManagerFactory entityManagerFactory() {
return mock(EntityManagerFactory.class);
}
}
}