corrige conflitos

diários_oficiais_alems/users/context_processors.py

@@ -0,0 +1,8 @@
+from django.conf import settings
+
+
+def allauth_settings(request):
+    """Expose some settings from django-allauth in templates."""
+    return {
+        "ACCOUNT_ALLOW_REGISTRATION": settings.ACCOUNT_ALLOW_REGISTRATION,
+    }