diff options
| author | David Lord <davidism@gmail.com> | 2017-04-05 07:26:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-05 07:26:07 -0700 |
| commit | 43f86e4f6feecde9b891b4b465359d8153f60630 (patch) | |
| tree | c7637f55f899741ba85d8118e405057efaf6666e | |
| parent | 044e40b7a7549eccb197017ca45da7b88739bc6c (diff) | |
| parent | ad2d90e78d4617dc2f992e0546725b39377dbd62 (diff) | |
| download | jinja2-43f86e4f6feecde9b891b4b465359d8153f60630.tar.gz | |
Merge pull request #700 from brunodoamaral/patch-1
Fixed incorrect merge in setup.py
| -rw-r--r-- | setup.py | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -40,11 +40,7 @@ from setuptools import setup setup( name='Jinja2', -<<<<<<< HEAD version='2.10.dev', -======= - version='2.9.7.dev', ->>>>>>> 2.9-maintenance url='http://jinja.pocoo.org/', license='BSD', author='Armin Ronacher', |