Fix merge conflicts

2024-09-21 11:29:09 +03:00 · 2017-12-18 12:27:48 -05:00 · 2017-12-18 12:27:48 -05:00 · 7f8877fba5
commit 7f8877fba5
parent fe35baa627 c73b6e32a9
1 changed files with 0 additions and 1 deletions
--- a/setup.py
+++ b/setup.py
@ -59,7 +59,6 @@ setup(
    install_requires=[
        'six>=1.10.0',
        'graphene>=2.0.1,<3',
-        'Django>=1.8.0',
        django_version,
        'iso8601',
        'singledispatch>=3.4.0.3',