gistfile1.txt

<<<<<<< HEAD
Django==1.5.5
dj-database-url==0.2.2
dj-static==0.0.5
django-appconf==0.5
django-forms-bootstrap==2.0.3.post1
django-jsonfield==0.8.12
-e git://github.com/agiliq/merchant.git@f5ebd361f00ce35e7cfee069ca79ffb0100bb30b#egg=django_merchant-v0.1
-e git+git://github.com/agiliq/merchant.git#egg=django-merchant
django-toolbelt==0.0.1
django-user-accounts==1.0b13
eventlog==0.6.2
gunicorn==18.0
metron==1.1
mock==1.0.1
pinax-theme-bootstrap==3.0a9
psycopg2==2.5.1
pytz==2012j
requests==2.0.1
static==0.4
stripe==1.9.8

=======
Django==1.6
argparse==1.2.1
cffi==1.1.2
cryptography==0.9.3
dj-database-url==0.2.2
dj-static==0.0.5
django-appconf==0.5
django-endless-pagination==2.0
django-forms-bootstrap==2.0.3.post1
django-jsonfield==0.8.12
django-merchant==0.2
django-toolbelt==0.0.1
django-user-accounts==1.0b13
enum34==1.0.4
eventlog==0.6.2
gunicorn==18.0
idna==2.0
ipaddress==1.0.14
jsonfield==1.0.3
metron==1.1
paypalrestsdk==1.10.1
pinax-theme-bootstrap==3.0a9
psycopg2==2.5.1
pyOpenSSL==0.15.1
pyasn1==0.1.8
pycparser==2.14
pytz==2012j
requests==2.7.0
six==1.9.0
static==0.4
stripe==1.23.0
>>>>>>> dev
wsgiref==0.1.2