Bla

mihca · mihca · commit ae955326c54b · 2013-09-17T11:25:04.000+02:00
diff --git a/MyFirstScalaProject/scripts/hello.sc b/MyFirstScalaProject/scripts/hello.sc
@@ -0,0 +1,7 @@
+object hello {
+  println("Welcome to the Scala worksheet")
+}
+
+def max(x:Int, y:Int) : Int = {
+	if (x>y) return x else return y
+}
diff --git a/MyFirstScalaProject/scripts/hello.scala b/MyFirstScalaProject/scripts/hello.scala
@@ -0,0 +1 @@
+println ("Hello, World, from a script")

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+println ("Hello, World, from a script")`