summaryrefslogtreecommitdiff
path: root/manage.py
diff options
context:
space:
mode:
authorhardythe12014-08-27 17:08:17 +0530
committerhardythe12014-08-27 17:08:17 +0530
commitdf9548bd2afc5f728559099402f5e4bc3cf038bc (patch)
treef3e7740f91a8a05c8bc73d8423deebb24c64573e /manage.py
parent72ec207ddc510e7584a3bd137f7bd3277f71c409 (diff)
downloadpyfoss-df9548bd2afc5f728559099402f5e4bc3cf038bc.tar.gz
pyfoss-df9548bd2afc5f728559099402f5e4bc3cf038bc.tar.bz2
pyfoss-df9548bd2afc5f728559099402f5e4bc3cf038bc.zip
resolving conflict
Diffstat (limited to 'manage.py')
0 files changed, 0 insertions, 0 deletions