diff options
| author | C. Bess <cbess@company.com> | 2015-11-09 17:55:53 -0600 |
|---|---|---|
| committer | C. Bess <cbess@company.com> | 2015-11-09 17:55:53 -0600 |
| commit | df0992d72c2a28f140e6ff9681c505f36e19249a (patch) | |
| tree | 508aa3abe4c25b957dca442560d9c95c9b1fc97a /lua.html.markdown | |
| parent | afc5ea14654e0e9cd11c7ef1b672639d12418bad (diff) | |
| parent | c460e1fafa0e9b4edc6a5cb35b970bb5cc030a81 (diff) | |
Merge remote-tracking branch 'adambard/master'
Conflicts:
swift.html.markdown
Diffstat (limited to 'lua.html.markdown')
| -rw-r--r-- | lua.html.markdown | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lua.html.markdown b/lua.html.markdown index 0809215f..3d95c146 100644 --- a/lua.html.markdown +++ b/lua.html.markdown @@ -190,7 +190,7 @@ end -------------------------------------------------------------------------------- -- A table can have a metatable that gives the table operator-overloadish --- behavior. Later we'll see how metatables support js-prototypey behavior. +-- behavior. Later we'll see how metatables support js-prototypey behaviour. f1 = {a = 1, b = 2} -- Represents the fraction a/b. f2 = {a = 2, b = 3} |