summaryrefslogtreecommitdiffhomepage
path: root/zh-cn/haskell-cn.html.markdown
diff options
context:
space:
mode:
authorHunter Stevens <onebree@gmail.com>2016-02-15 17:47:35 -0500
committerHunter Stevens <onebree@gmail.com>2016-02-15 17:47:35 -0500
commitd0b067b140d3d351ae9dee0b3e542935b7ca35d4 (patch)
treeb83501b5b82240663029d7382f873fb369ea81c7 /zh-cn/haskell-cn.html.markdown
parentcffb7e6770b517a620115b3a9e1f82ca1dd82a98 (diff)
parentcd16626c8f64a29d8235bd0ab21c7a32e248928f (diff)
Resolve conflicts from merge
Diffstat (limited to 'zh-cn/haskell-cn.html.markdown')
-rw-r--r--zh-cn/haskell-cn.html.markdown6
1 files changed, 3 insertions, 3 deletions
diff --git a/zh-cn/haskell-cn.html.markdown b/zh-cn/haskell-cn.html.markdown
index 8904970f..b0b1183f 100644
--- a/zh-cn/haskell-cn.html.markdown
+++ b/zh-cn/haskell-cn.html.markdown
@@ -200,13 +200,13 @@ foo 5 -- 75
-- 你可以使用 `$` 来移除多余的括号。
-- 修改前
-(even (fib 7)) -- true
+(even (fib 7)) -- False
-- 修改后
-even . fib $ 7 -- true
+even . fib $ 7 -- False
-- 等价地
-even $ fib 7 -- true
+even $ fib 7 -- False
----------------------------------------------------
-- 5. 类型声明