From ffc3a827c250750dbe70c675f222cbb01d4601c8 Mon Sep 17 00:00:00 2001
From: moT01 <tmondloch01@gmail.com>
Date: Fri, 31 May 2019 21:11:59 -0500
Subject: [PATCH] fix/conflicts

---
 curriculum/challenges/_meta/es6/meta.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/curriculum/challenges/_meta/es6/meta.json b/curriculum/challenges/_meta/es6/meta.json
index 6e8db8334e..702e0cbc99 100644
--- a/curriculum/challenges/_meta/es6/meta.json
+++ b/curriculum/challenges/_meta/es6/meta.json
@@ -99,13 +99,10 @@
     [
       "587d7b8c367417b2b2512b56",
       "Use export to Share a Code Block"
-<<<<<<< HEAD
     ],
     [
       "587d7b8c367417b2b2512b55",
       "Reuse Javascript Code Using import"
-=======
->>>>>>> fix/rename-lessons
     ],
     [
       "587d7b8c367417b2b2512b55",