diff options
| author | Hunter Stevens <onebree@gmail.com> | 2016-02-15 17:47:35 -0500 |
|---|---|---|
| committer | Hunter Stevens <onebree@gmail.com> | 2016-02-15 17:47:35 -0500 |
| commit | d0b067b140d3d351ae9dee0b3e542935b7ca35d4 (patch) | |
| tree | b83501b5b82240663029d7382f873fb369ea81c7 /elixir.html.markdown | |
| parent | cffb7e6770b517a620115b3a9e1f82ca1dd82a98 (diff) | |
| parent | cd16626c8f64a29d8235bd0ab21c7a32e248928f (diff) | |
Resolve conflicts from merge
Diffstat (limited to 'elixir.html.markdown')
| -rw-r--r-- | elixir.html.markdown | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/elixir.html.markdown b/elixir.html.markdown index eedeb227..720e080c 100644 --- a/elixir.html.markdown +++ b/elixir.html.markdown @@ -343,6 +343,7 @@ rescue RuntimeError -> "rescued a runtime error" _error -> "this will rescue any error" end +#=> "rescued a runtime error" # All exceptions have a message try do @@ -351,6 +352,7 @@ rescue x in [RuntimeError] -> x.message end +#=> "some error" ## --------------------------- ## -- Concurrency |