Merge branch 'master' of https://github.com/hexagonframework/spring-data-ebean-spring-boot

yuanxuegui · yuanxuegui · commit b50981d39568 · 2018-02-27T14:49:31.000+08:00
# Conflicts:
#	README.md
diff --git a/README.md b/README.md
@@ -6,4 +6,3 @@
 
 
 [Example](https://github.com/hexagonframework/spring-boot-data-ebean-samples)
-

Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,3 @@`
`6`	`6`
`7`	`7`
`8`	`8`	`[Example](https://github.com/hexagonframework/spring-boot-data-ebean-samples)`
`9`		`-`