corrige conflitos

diários_oficiais_alems/templates/allauth/layouts/entrance.html

@@ -0,0 +1,31 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% block bodyclass %}bg-light{% endblock bodyclass %}
+
+{% block css %}{{ block.super }}{% endblock css %}
+{% block title %}
+  {% block head_title %}
+    {% trans "Sign In" %}
+  {% endblock head_title %}
+{% endblock title %}
+{% block body %}
+  <div class="d-flex justify-content-center h-100 py-4">
+    <div class="col-md-4 py-4 my-4 px-4">
+      {% if messages %}
+        {% for message in messages %}
+          <div class="alert alert-dismissible {% if message.tags %}alert-{{ message.tags }}{% endif %}">
+            {{ message }}
+            <button type="button"
+                    class="btn-close"
+                    data-bs-dismiss="alert"
+                    aria-label="Close"></button>
+          </div>
+        {% endfor %}
+      {% endif %}
+      {% block content %}
+      {% endblock content %}
+      {% block extra_body %}
+      {% endblock extra_body %}
+    </div>
+  </div>
+{% endblock body %}

diários_oficiais_alems/templates/allauth/layouts/manage.html

@@ -0,0 +1,6 @@
+{% extends "base.html" %}
+
+{% block main %}
+  {% block content %}
+  {% endblock content %}
+{% endblock main %}