diff options
author | David Hsieh <davidhsiehlo@gmail.com> | 2016-03-11 08:39:26 -0600 |
---|---|---|
committer | David Hsieh <davidhsiehlo@gmail.com> | 2016-03-11 08:39:26 -0600 |
commit | 8d1e2e31ef9c62e2833ccb83cde78caef668f044 (patch) | |
tree | 1cca5af13a146c0a36ef760b6264d18875290ec0 /erlang.html.markdown | |
parent | 51c2f7ce28caf1cc654bcafc4063f3012cc2f0c3 (diff) | |
parent | 6e38442b857a9d8178b6ce6713b96c52bf4426eb (diff) |
Merge conflict r-spanish
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 d6ed7b86..a57f295f 100644 --- a/erlang.html.markdown +++ b/erlang.html.markdown @@ -177,7 +177,7 @@ is_dog(A) -> false. % A guard sequence is either a single guard or a series of guards, separated % by semicolons (`;`). The guard sequence `G1; G2; ...; Gn` is true if at % least one of the guards `G1`, `G2`, ..., `Gn` evaluates to `true`. -is_pet(A) when is_atom(A), (A =:= dog) or (A =:= cat) -> true; +is_pet(A) when is_atom(A), (A =:= dog);(A =:= cat) -> true; is_pet(A) -> false. % Warning: not all valid Erlang expressions can be used as guard expressions; |