conditional code md file

Rebecca Murphey · ajpiano · commit f91ee583f098 · 2011-03-24T00:54:13.000-04:00
diff --git a/content/javascript-101/conditional-code.md b/content/javascript-101/conditional-code.md
@@ -1,8 +1,14 @@
 ---
+<<<<<<< HEAD
 chapter :     js101
 section:      3
 title:        Conditional Code
 attribution:  jQuery Fundamentals
+=======
+chapter : "js101"
+section:  "3"
+title:    "Conditional Code"
+>>>>>>> conditional code md file
 ---
 
 Sometimes you only want to run a block of code under certain conditions. Flow control — via if and else blocks — lets you run code only under certain conditions.
