diff options
| author | Ian Bertolacci <ian.bertolacci@gmail.com> | 2015-10-04 22:02:33 -0600 |
|---|---|---|
| committer | Ian Bertolacci <ian.bertolacci@gmail.com> | 2015-10-04 22:02:33 -0600 |
| commit | a9680e9c02a9490549b6939f7cb16fa88a880538 (patch) | |
| tree | af81bebcd9b564dce72f213fe14a17fe4b9032b2 /zh-cn/csharp-cn.html.markdown | |
| parent | 57ea4af17c7ab17e9c32096c2579e0a985e44781 (diff) | |
| parent | ad4d6f3c1e9dfba3933651116535d590a17092df (diff) | |
Merge branch 'master' of github.com:adambard/learnxinyminutes-docs
Fixed down merge-conflict.
Diffstat (limited to 'zh-cn/csharp-cn.html.markdown')
| -rw-r--r-- | zh-cn/csharp-cn.html.markdown | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/zh-cn/csharp-cn.html.markdown b/zh-cn/csharp-cn.html.markdown index a3cda5b3..971c1be9 100644 --- a/zh-cn/csharp-cn.html.markdown +++ b/zh-cn/csharp-cn.html.markdown @@ -232,7 +232,8 @@ on a new line! ""Wow!"", the masses cried"; // 三元表达式 // 简单的 if/else 语句可以写成： // <条件> ? <真> : <假> - string isTrue = (true) ? "True" : "False"; + int toCompare = 17; + string isTrue = toCompare == 17 ? "True" : "False"; // While 循环 int fooWhile = 0; |