Fixed incorrect merge in setup.py

I just don't know if the correct version is 2.9.7.dev or 2.10.dev

diff --git a/setup.py b/setup.py
index ac2f5095cf2e4292c5cb82609446280a1f2a54e3..b77ff428ec5a3000fe138feb11834666dbc3b5ce 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -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',