corrige conflitos

diários_oficiais_alems/templates/404.html

@@ -0,0 +1,13 @@
+{% extends "base.html" %}
+
+{% block title %}Page not found{% endblock title %}
+{% block content %}
+  <h1>Page not found</h1>
+  <p>
+    {% if exception %}
+      {{ exception }}
+    {% else %}
+      This is not the page you were looking for.
+    {% endif %}
+  </p>
+{% endblock content %}