Fix merge conflict

Author: =

setup.py

@@ -24,6 +24,7 @@
     '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 @@
         'six>=1.10.0',
         'graphene>=2.0.1,<3',
         'Django>=1.8.0',
+        django_version,
         'iso8601',
         'singledispatch>=3.4.0.3',
         'promise>=2.1',