summaryrefslogtreecommitdiffhomepage
path: root/scala.html.markdown
diff options
context:
space:
mode:
authorJohn Gabriele <jgabriele@fastmail.fm>2018-09-10 02:05:03 -0400
committerJohn Gabriele <jgabriele@fastmail.fm>2018-09-10 02:05:03 -0400
commit3cfdf5777266d780a211cdad1c52755170097cc8 (patch)
tree8a269e1679f14ceac7a10c0592fa14bb947e5208 /scala.html.markdown
parent60eac5d50054ddae92bd23fb51f3acc1c306a762 (diff)
parent6d087ae0f289e7013807639cbd609f991f968166 (diff)
Merge remote-tracking branch 'origin/master' into patch-1
Diffstat (limited to 'scala.html.markdown')
-rw-r--r--scala.html.markdown2
1 files changed, 1 insertions, 1 deletions
diff --git a/scala.html.markdown b/scala.html.markdown
index 016e2b4f..28424684 100644
--- a/scala.html.markdown
+++ b/scala.html.markdown
@@ -716,7 +716,7 @@ import scala.collection.immutable.{Map => _, Set => _, _}
// Java classes can also be imported. Scala syntax can be used
import java.swing.{JFrame, JWindow}
-// Your programs entry point is defined in an scala file using an object, with a
+// Your programs entry point is defined in a scala file using an object, with a
// single method, main:
object Application {
def main(args: Array[String]): Unit = {