diff options
| author | Casey Duncan <casey.duncan@gmail.com> | 2011-01-17 12:00:37 -0700 |
|---|---|---|
| committer | Casey Duncan <casey.duncan@gmail.com> | 2011-01-17 12:00:37 -0700 |
| commit | bd3c7d796f940f8b7296631b8a3466fd00bc16f7 (patch) | |
| tree | 03547fa989487dee4df8e6fb70d45b9ee1f5f6ad /setup.py | |
| parent | e849fee8351f77d1a2afd97748dd14e3603c47a8 (diff) | |
| parent | 566004501e8a28c0ba8f8c882ca5ea0742e5d285 (diff) | |
| download | pyramid-bd3c7d796f940f8b7296631b8a3466fd00bc16f7.tar.gz pyramid-bd3c7d796f940f8b7296631b8a3466fd00bc16f7.tar.bz2 pyramid-bd3c7d796f940f8b7296631b8a3466fd00bc16f7.zip | |
fix merge conflict
Diffstat (limited to 'setup.py')
| -rw-r--r-- | setup.py | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -83,9 +83,6 @@ setup(name='pyramid', pyramid_zodb=pyramid.paster:ZODBProjectTemplate pyramid_routesalchemy=pyramid.paster:RoutesAlchemyProjectTemplate pyramid_alchemy=pyramid.paster:AlchemyProjectTemplate - pylons_basic=pyramid.paster:PylonsBasicProjectTemplate - pylons_minimal=pyramid.paster:PylonsMinimalProjectTemplate - pylons_sqla=pyramid.paster:PylonsSQLAlchemyProjectTemplate [paste.paster_command] pshell=pyramid.paster:PShellCommand proutes=pyramid.paster:PRoutesCommand |