diff options
author | nishanth | 2010-02-04 23:16:46 +0530 |
---|---|---|
committer | nishanth | 2010-02-04 23:16:46 +0530 |
commit | b73b0118d99799c7f0abd553f82fac8a65f7f214 (patch) | |
tree | 82da77ed222f7ee834738c1bea63c3ff0e7bad89 /taskapp/tests.py | |
parent | 9f940aa6a9e67241d1c680b35b8f280f7210c514 (diff) | |
download | pytask-b73b0118d99799c7f0abd553f82fac8a65f7f214.tar.gz pytask-b73b0118d99799c7f0abd553f82fac8a65f7f214.tar.bz2 pytask-b73b0118d99799c7f0abd553f82fac8a65f7f214.zip |
resolved merging conflicts in urls.py .
Diffstat (limited to 'taskapp/tests.py')
0 files changed, 0 insertions, 0 deletions