adding attribution

Author: Rebecca Murphey

content/javascript-101/conditional-code.md

@@ -1,14 +1,8 @@
 ---
-<<<<<<< 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.

content/javascript-101/loops.md

@@ -1,14 +1,20 @@
 ---
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> adding attribution
 chapter :     js10
 section:      4
 title:        Loops
 attribution:  jQuery Fundamentals
+<<<<<<< HEAD
 =======
 chapter : "js10"
 section:  "4"
 title:    "Loops"
 >>>>>>> loops md file
+=======
+>>>>>>> adding attribution
 ---
 Loops let you run a block of code a certain number of times.