Merge remote-tracking branch 'origin/2.12.x' into 2.13.x

retronym · retronym · commit 288038e50c0f · 2021-06-16T14:22:44.000+10:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
-  # The scala/scala travis job triggers a build of scala/scala-dist with `mode=release`. For
+# The scala/scala travis job triggers a build of scala/scala-dist with `mode=release`. For
 # the other modes (see below), use the web UI to trigger a build.
 #
 # Additional env vars are defined using a `before_install` custom config(*), for example

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		- # The scala/scala travis job triggers a build of scala/scala-dist with `mode=release`. For
	`1`	+# The scala/scala travis job triggers a build of scala/scala-dist with `mode=release`. For
`2`	`2`	`# the other modes (see below), use the web UI to trigger a build.`
`3`	`3`	`#`
`4`	`4`	# Additional env vars are defined using a `before_install` custom config(*), for example