From 718a9c2a972c8afcdcfb2fb64f7042e1e22ffb5d Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Mon, 22 Feb 2016 10:21:34 -0500 Subject: [PATCH] Fix up some merge requirements conflicts --- requirements/requirements.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index eadd73588e..c2ff9995ef 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -123,12 +123,10 @@ requests==2.5.1 requestsexceptions==1.1.1 shade==1.4.0 simplejson==3.8.1 -git+https://github.com/chrismeyersfsu/sitecustomize.git#egg=sitecustomize six==1.9.0 statsd==3.2.1 stevedore==1.10.0 suds==0.4 -South==1.0.2 unicodecsv==0.14.1 warlock==1.2.0 wheel==0.24.0