corrige conflitos

diários_oficiais_alems/templates/500.html

@@ -0,0 +1,10 @@
+{% extends "base.html" %}
+
+{% block title %}Server Error{% endblock title %}
+{% block content %}
+  <h1>Ooops!!! 500</h1>
+  <h3>Looks like something went wrong!</h3>
+  <p>
+    We track these errors automatically, but if the problem persists feel free to contact us. In the meantime, try refreshing.
+  </p>
+{% endblock content %}