From ad2d90e78d4617dc2f992e0546725b39377dbd62 Mon Sep 17 00:00:00 2001
From: Bruno Guberfain do Amaral <bruno.do.amaral@gmail.com>
Date: Wed, 5 Apr 2017 11:01:25 -0300
Subject: [PATCH] Fixed incorrect merge in setup.py

I just don't know if the correct version is 2.9.7.dev or 2.10.dev
---
 setup.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/setup.py b/setup.py
index ac2f5095c..b77ff428e 100644
--- 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',