diff options
author | Geoff Liu <g@geoffliu.me> | 2015-04-17 14:06:47 -0400 |
---|---|---|
committer | Geoff Liu <g@geoffliu.me> | 2015-04-17 14:06:47 -0400 |
commit | 49e8dd42636199f19d250bc6b169764f5ebe0ed7 (patch) | |
tree | 4a91f68d8c75720eb8c1cf288fcbeba0f841e62c /erlang.html.markdown | |
parent | 61510ee92caaca9c841da6e40c8e1d680d1b7e34 (diff) | |
parent | b44aded453d94d5a196356f3c05c678d6ec9323c (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'erlang.html.markdown')
-rw-r--r-- | erlang.html.markdown | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erlang.html.markdown b/erlang.html.markdown index 04086aeb..a7390c3e 100644 --- a/erlang.html.markdown +++ b/erlang.html.markdown @@ -206,7 +206,7 @@ max(X, Y) -> if X > Y -> X; X < Y -> Y; - true -> nil; + true -> nil end. % Warning: at least one of the guards in the `if` expression must evaluate to true; |