summaryrefslogtreecommitdiffhomepage
path: root/csharp.html.markdown
diff options
context:
space:
mode:
authorIan Bertolacci <ian.bertolacci@gmail.com>2015-10-04 22:02:33 -0600
committerIan Bertolacci <ian.bertolacci@gmail.com>2015-10-04 22:02:33 -0600
commita9680e9c02a9490549b6939f7cb16fa88a880538 (patch)
treeaf81bebcd9b564dce72f213fe14a17fe4b9032b2 /csharp.html.markdown
parent57ea4af17c7ab17e9c32096c2579e0a985e44781 (diff)
parentad4d6f3c1e9dfba3933651116535d590a17092df (diff)
Merge branch 'master' of github.com:adambard/learnxinyminutes-docs
Fixed down merge-conflict.
Diffstat (limited to 'csharp.html.markdown')
-rw-r--r--csharp.html.markdown3
1 files changed, 2 insertions, 1 deletions
diff --git a/csharp.html.markdown b/csharp.html.markdown
index 479b7f01..222ba0d2 100644
--- a/csharp.html.markdown
+++ b/csharp.html.markdown
@@ -236,7 +236,8 @@ on a new line! ""Wow!"", the masses cried";
// Ternary operators
// A simple if/else can be written as follows
// <condition> ? <true> : <false>
- string isTrue = (true) ? "True" : "False";
+ int toCompare = 17;
+ string isTrue = toCompare == 17 ? "True" : "False";
// While loop
int fooWhile = 0;