loops md file

Rebecca Murphey · ajpiano · commit fc033032a3c6 · 2011-03-24T00:54:21.000-04:00
diff --git a/content/javascript-101/loops.md b/content/javascript-101/loops.md
@@ -1,8 +1,14 @@
 ---
+<<<<<<< HEAD
 chapter :     js10
 section:      4
 title:        Loops
 attribution:  jQuery Fundamentals
+=======
+chapter : "js10"
+section:  "4"
+title:    "Loops"
+>>>>>>> loops md file
 ---
 Loops let you run a block of code a certain number of times.
 
