Phillip Webb 69d8bf8686 Fix merge conflict ...

Closes gh-11969

2018-02-08 18:01:22 -08:00

..

eclipse-code-formatter.xml

Upgrade formatter settings

2018-02-08 15:23:42 -08:00

org.eclipse.jdt.core.prefs

Fix merge conflict

2018-02-08 18:01:22 -08:00

org.eclipse.jdt.ui.prefs

Merge branch '1.5.x'

2018-02-08 15:31:48 -08:00

spring-boot-project.setup

Merge branch '1.5.x'

2018-02-08 15:31:48 -08:00