corrige conflitos

requirements/base.txt

@@ -0,0 +1,18 @@
+python-slugify==8.0.4  # https://github.com/un33k/python-slugify
+Pillow==11.1.0  # https://github.com/python-pillow/Pillow
+rcssmin==1.1.2  # https://github.com/ndparker/rcssmin
+argon2-cffi==23.1.0  # https://github.com/hynek/argon2_cffi
+whitenoise==6.9.0  # https://github.com/evansd/whitenoise
+redis==5.2.1  # https://github.com/redis/redis-py
+hiredis==3.1.0  # https://github.com/redis/hiredis-py
+
+# Django
+# ------------------------------------------------------------------------------
+django==5.0.12  # pyup: < 5.1  # https://www.djangoproject.com/
+django-environ==0.12.0  # https://github.com/joke2k/django-environ
+django-model-utils==5.0.0  # https://github.com/jazzband/django-model-utils
+django-allauth[mfa]==65.4.1  # https://github.com/pennersr/django-allauth
+django-crispy-forms==2.3  # https://github.com/django-crispy-forms/django-crispy-forms
+crispy-bootstrap5==2024.10  # https://github.com/django-crispy-forms/crispy-bootstrap5
+django-compressor==4.5.1  # https://github.com/django-compressor/django-compressor
+django-redis==5.4.0  # https://github.com/jazzband/django-redis