Merge remote-tracking branch 'origin/master'

lihaoyi · May 9, 2013 · 63826e2 · 63826e2
2 parents 5c39dd3 + 956974d
commit 63826e2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/readme.md b/readme.md
@@ -442,7 +442,7 @@ Pattern Matching
 Pattern matching is taken from many functional languages, including Haskell,
 ML, and Scala, all of which allow a convenient syntax for extracting elements
 out of a complex data structure.  The most basic way of matching an object
-against a pattern is to use the patterns block macro, and use the left shit
+against a pattern is to use the patterns block macro, and use the left shift
 operator, as shown.