8000 Merge branch 'master' of github.com:scala/scala.github.com · apapi/scala.github.com@84e3d9e · GitHub
[go: up one dir, main page]
Skip to content

Commit 84e3d9e

Browse files
heathermillerheathermiller
committed
Merge branch 'master' of github.com:scala/scala.github.com
2 parents f37fd2f + 5350249 commit 84e3d9e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

‎overviews/macros/typemacros.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ outof: 3
1212

1313
**Eugene Burmako**
1414

15-
Quasiquotes are a pre-release feature included in so-called macro paradise, a dedicated branch in the official Scala repository. To learn more about macro paradise, check out [my talk](http://scalamacros.org/news/2012/12/18/macro-paradise.html).
15+
Type macros are a pre-release feature included in so-called macro paradise, a dedicated branch in the official Scala repository. To learn more about macro paradise, check out [my talk](http://scalamacros.org/news/2012/12/18/macro-paradise.html).
1616

1717
## Intuition
1818

0 commit comments

Comments
 (0)
0