Merge branch 'master' into update/2.13.0-RC1

kailuowang · web-flow · commit 8cd5abb7b554 · 2019-04-17T14:01:24.000-04:00
diff --git a/build.sbt b/build.sbt
@@ -151,6 +151,7 @@ lazy val includeGeneratedSrc: Setting[_] = {
   }
 }
 
+
 val scalatestVersion = "3.0.8-RC2"
 
 val scalaCheckVersion = "1.14.0"

Original file line number	Diff line number	Diff line change
`@@ -151,6 +151,7 @@ lazy val includeGeneratedSrc: Setting[_] = {`
`151`	`151`	`}`
`152`	`152`	`}`
`153`	`153`
	`154`	`+`
`154`	`155`	`val scalatestVersion = "3.0.8-RC2"`
`155`	`156`
`156`	`157`	`val scalaCheckVersion = "1.14.0"`