Add back in those packages
- I was just paranoid before
<<<<<<< 6b5bee16097fec111893ed6546a9bb96fa506828 | ||
Django==1.10 | ||
django-auth-ldap==1.2.8 | ||
======= | ||
Django==1.9.1 | ||
>>>>>>> wipe another useless pip package | ||
django-crispy-forms==1.6.0 | ||
django-piwik==0.1 | ||
django-qrcode==0.3 | ||
... | ... | @@ -17,9 +13,16 @@ MySQL-python==1.2.5 |
pep8==1.7.0 | ||
Pillow==3.3.0 | ||
piwikapi==0.3 | ||
<<<<<<< a0866cc7e90c7c05aeadecb07be0b1fa475e2b77 | ||
pyflakes==1.2.3 | ||
python-ldap==2.4.27 | ||
requests==2.11.0 | ||
simplejson==3.8.2 | ||
======= | ||
pyflakes==1.0.0 | ||
python-ldap==2.4.22 | ||
requests==2.9.1 | ||
simplejson==3.8.1 | ||
>>>>>>> Add back in those packages | ||
six==1.10.0 | ||
wheel==0.29.0 |
Please register or sign in to comment