From ae562f5e5ba6256ea53011d15c377b5ef95ebd69 Mon Sep 17 00:00:00 2001 From: Han Su Kim Date: Fri, 7 Mar 2014 12:25:07 -0500 Subject: [PATCH] typo error in this file causing it to fail to install --- requirements/edx/edx-private.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements/edx/edx-private.txt b/requirements/edx/edx-private.txt index 9e19b30730..34999f38ad 100644 --- a/requirements/edx/edx-private.txt +++ b/requirements/edx/edx-private.txt @@ -1,4 +1,3 @@ -<<<<<<< HEAD # Requirements for edx.org that aren't necessarily needed for Open edX. -e git+ssh://git@github.com/jazkarta/edX-jsdraw.git@df9d048e331a642193e5aa2e03650fb84a9d715f#egg=edx-jsdraw