External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-04 02:58:13 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fix up some merge requirements conflicts

Browse Source
This commit is contained in:
Matthew Jones
2016-02-22 10:21:34 -05:00
parent c3121211c3
commit 718a9c2a97
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
requirements/requirements.txt
View File

@@ -123,12 +123,10 @@ requests==2.5.1
requestsexceptions==1.1.1 requestsexceptions==1.1.1
shade==1.4.0 shade==1.4.0
simplejson==3.8.1 simplejson==3.8.1
git+https://github.com/chrismeyersfsu/sitecustomize.git#egg=sitecustomize
six==1.9.0 six==1.9.0
statsd==3.2.1 statsd==3.2.1
stevedore==1.10.0 stevedore==1.10.0
suds==0.4 suds==0.4
South==1.0.2
unicodecsv==0.14.1 unicodecsv==0.14.1
warlock==1.2.0 warlock==1.2.0
wheel==0.24.0 wheel==0.24.0