Reslove conflicts

Signed-off-by: Khanh Ngo <khanh.ngo@taxfix.de>
2025-07-30 01:03:44 +00:00 · 2021-10-30 21:19:01 +02:00
parent ddf2d4788b d6e64dce8e
commit b7197948c1
2 changed files with 2 additions and 2 deletions
--- a/powerdnsadmin/templates/admin_edit_account.html
+++ b/powerdnsadmin/templates/admin_edit_account.html
@@ -162,4 +162,4 @@
        }
    });
 </script>
-{% endblock %}
+{% endblock %}