From: Bruno Guberfain do Amaral <bruno.do.amaral@gmail.com>
Date: Wed, 5 Apr 2017 14:01:25 +0000 (-0300)
Subject: Fixed incorrect merge in setup.py
X-Git-Tag: 2.10~30^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad2d90e78d4617dc2f992e0546725b39377dbd62;p=thirdparty%2Fjinja.git

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 ac2f5095..b77ff428 100644
--- 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',