<<<<<<< 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 flake8==3.0.4 git+https://github.com/kstateome/django-cas.git git+https://github.com/bruno207/django-bootstrap3-datetimepicker.git gunicorn==19.6.0 hashids==1.1.0 mccabe==0.5.2 MySQL-python==1.2.5 pep8==1.7.0 Pillow==3.3.0 piwikapi==0.3 pyflakes==1.2.3 python-ldap==2.4.27 requests==2.11.0 simplejson==3.8.2 six==1.10.0 wheel==0.29.0