Merge pull request #700 from brunodoamaral/patch-1

Fixed incorrect merge in setup.py
pallets · Apr 5, 2017 · 43f86e4 · 43f86e4
2 parents 044e40b + ad2d90e
commit 43f86e4
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/setup.py b/setup.py
@@ -40,11 +40,7 @@
 
 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',