From c2f81fd26dc2ce653119adcc076ae5ac8c55596f Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Thu, 24 Aug 2017 21:45:00 -0600
Subject: [PATCH] removed merge marks

---
 themes/grav/templates/partials/login.html.twig | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/themes/grav/templates/partials/login.html.twig b/themes/grav/templates/partials/login.html.twig
index 37b16d7f..e318c6b8 100644
--- a/themes/grav/templates/partials/login.html.twig
+++ b/themes/grav/templates/partials/login.html.twig
@@ -16,11 +16,7 @@
         <form method="post" action="{{ base_url_relative }}">
             <div class="padding">
                 {% block form %}{% endblock %}
-<<<<<<< Updated upstream
-                <input type="hidden" name="redirect" value="{{ uri.url(false) }}" />
-=======
                 <input type="hidden" name="redirect" value="{{ uri.route(false) }}" />
->>>>>>> Stashed changes
                 {{ nonce_field('admin-form', 'admin-nonce')|raw }}
             </div>
         </form>