diff options
| author | Levi Bostian <levi.bostian@banno.com> | 2013-11-25 09:42:37 -0600 |
|---|---|---|
| committer | Levi Bostian <levi.bostian@banno.com> | 2013-11-25 09:42:37 -0600 |
| commit | af6701904b459b16cf65709cd8c70fd2f5519457 (patch) | |
| tree | 68cb4bf9ead32686f492e68528e9f0761e41c500 /es-es/coffeescript-es.html.markdown | |
| parent | df3cc00f5233dac96c0e063d87d3552f493e25f6 (diff) | |
| parent | d24c824d388669181eed99c3e94bb25c2914304a (diff) | |
Fix conflict bash.
Diffstat (limited to 'es-es/coffeescript-es.html.markdown')
| -rw-r--r-- | es-es/coffeescript-es.html.markdown | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/es-es/coffeescript-es.html.markdown b/es-es/coffeescript-es.html.markdown index 78bb9be5..6bf430e6 100644 --- a/es-es/coffeescript-es.html.markdown +++ b/es-es/coffeescript-es.html.markdown @@ -44,7 +44,7 @@ math = # "cube": function(x) { return x * square(x); } #} -# Símbolos: +# Número de argumentos variable: race = (winner, runners...) -> print winner, runners @@ -52,6 +52,6 @@ race = (winner, runners...) -> alert "I knew it!" if elvis? #=> if(typeof elvis !== "undefined" && elvis !== null) { alert("I knew it!"); } -# Colecciones por comprensión: +# Listas: cubes = (math.cube num for num in list) #=> ... ``` |