diff options
| author | Ian Bertolacci <ian.bertolacci@gmail.com> | 2015-10-04 22:02:33 -0600 |
|---|---|---|
| committer | Ian Bertolacci <ian.bertolacci@gmail.com> | 2015-10-04 22:02:33 -0600 |
| commit | a9680e9c02a9490549b6939f7cb16fa88a880538 (patch) | |
| tree | af81bebcd9b564dce72f213fe14a17fe4b9032b2 /hack.html.markdown | |
| parent | 57ea4af17c7ab17e9c32096c2579e0a985e44781 (diff) | |
| parent | ad4d6f3c1e9dfba3933651116535d590a17092df (diff) | |
Merge branch 'master' of github.com:adambard/learnxinyminutes-docs
Fixed down merge-conflict.
Diffstat (limited to 'hack.html.markdown')
| -rw-r--r-- | hack.html.markdown | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/hack.html.markdown b/hack.html.markdown index 632fc705..b9730dc0 100644 --- a/hack.html.markdown +++ b/hack.html.markdown @@ -2,6 +2,7 @@ language: Hack contributors: - ["Stephen Holdaway", "https://github.com/stecman"] + - ["David Lima", "https://github.com/davelima"] filename: learnhack.hh --- @@ -152,7 +153,7 @@ class ArgumentPromotion private bool $isAwesome) {} } -class WithoutArugmentPromotion +class WithoutArgumentPromotion { public string $name; @@ -169,9 +170,9 @@ class WithoutArugmentPromotion } -// Co-oprerative multi-tasking +// Co-operative multi-tasking // -// Two new keywords "async" and "await" can be used to perform mutli-tasking +// Two new keywords "async" and "await" can be used to perform multi-tasking // Note that this does not involve threads - it just allows transfer of control async function cooperativePrint(int $start, int $end) : Awaitable<void> { |