From fe35baa627cce4c8bca671df6e677d93bfefb96e Mon Sep 17 00:00:00 2001
From: = <=>
Date: Wed, 6 Dec 2017 15:10:50 -0500
Subject: [PATCH] Fix merge conflict

---
 setup.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setup.py b/setup.py
index e31f87b..b4a1633 100644
--- a/setup.py
+++ b/setup.py
@@ -24,6 +24,7 @@ tests_require = [
     'pytest-django==2.9.1',
 ] + rest_framework_require
 
+django_version = 'Django>=1.8.0,<2' if sys.version_info[0] < 3 else 'Django>=1.8.0'
 setup(
     name='graphene-django',
     version=version,
@@ -59,6 +60,7 @@ setup(
         'six>=1.10.0',
         'graphene>=2.0.1,<3',
         'Django>=1.8.0',
+        django_version,
         'iso8601',
         'singledispatch>=3.4.0.3',
         'promise>=2.1',