diff --git a/themes/grav/templates/partials/login.html.twig b/themes/grav/templates/partials/login.html.twig index c89fdaf7..37b16d7f 100644 --- a/themes/grav/templates/partials/login.html.twig +++ b/themes/grav/templates/partials/login.html.twig @@ -16,7 +16,11 @@
{% block form %}{% endblock %} +<<<<<<< Updated upstream +======= + +>>>>>>> Stashed changes {{ nonce_field('admin-form', 'admin-nonce')|raw }}