From c7b1668dcd6518cf3152b8764217bb8df7382d4f Mon Sep 17 00:00:00 2001
From: Michael Q Larson <michaelqlarson@gmail.com>
Date: Sat, 14 Feb 2015 16:30:15 -0800
Subject: [PATCH] missed a conflict during a merge

---
 seed_data/bonfires.json | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/seed_data/bonfires.json b/seed_data/bonfires.json
index 501539b31d..869df527a0 100644
--- a/seed_data/bonfires.json
+++ b/seed_data/bonfires.json
@@ -209,17 +209,10 @@
     ]
   },
   {
-<<<<<<< HEAD
-    "_id": "a39963a4c10bc8b4d4f06d7e",
-    "name": "Seek and Destroy",
-    "difficulty": "1.60",
-    "description": [
-=======
     "_id":"a39963a4c10bc8b4d4f06d7e",
     "name":"Seek and Destroy",
     "difficulty":"1.60",
     "description":[
->>>>>>> master
       "Remove all values (last argument(s)) from an array (first argument) and return as a new array."
     ],
     "challengeSeed": "function destroyer(arr) {\n  // Remove all the values\r\n  return arr;\r\n}\n\ndestroyer([1, 2, 3, 1, 2, 3], 2, 3);",