Fixed conflicts

This commit is contained in:
Tetsuro
2015-12-04 21:35:11 -05:00
8 changed files with 48 additions and 95 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
---
title: Truthy and Falsy
title: Truthy and falsy
---
In programming, anything that returns `true` in a conditional is called **truthy**. Anything that returns `false` in a conditional is called **falsy**. All object types can be described as either truthy or falsy.