Fix merge conflicts

= · = · commit 7f8877fba514 · 2017-12-18T12:27:48.000-05:00
diff --git a/setup.py b/setup.py
@@ -59,7 +59,6 @@
     install_requires=[
         'six>=1.10.0',
         'graphene>=2.0.1,<3',
-        'Django>=1.8.0',
         django_version,
         'iso8601',
         'singledispatch>=3.4.0.3',
