cleanup leftover merge conflict

ajpiano · ajpiano · commit b67add75a1af · 2011-03-24T01:33:59.000-04:00
diff --git a/content/javascript-101/loops.md b/content/javascript-101/loops.md
@@ -1,20 +1,8 @@
 ---
-<<<<<<< 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.
 
