Merge branch 'master' of github.com:lihaoyi/Ammonite

lihaoyi · lihaoyi · commit ecaed30292d8 · 2017-06-04T04:48:02.000+08:00
diff --git a/shell/src/main/resources/ammonite/shell/example-predef.sc b/shell/src/main/resources/ammonite/shell/example-predef.sc
@@ -1,6 +1,6 @@
 interp.load.ivy(
   "com.lihaoyi" %
-  s"ammonite-shell_${util.Properties.versionNumberString}" %
+  s"ammonite-shell_${scala.util.Properties.versionNumberString}" %
   ammonite.Constants.version
 )
 @

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`interp.load.ivy(`
`2`	`2`	`"com.lihaoyi" %`
`3`		`- s"ammonite-shell_${util.Properties.versionNumberString}" %`
	`3`	`+ s"ammonite-shell_${scala.util.Properties.versionNumberString}" %`
`4`	`4`	`ammonite.Constants.version`
`5`	`5`	`)`
`6`	`6`	`@`