removed merge marks

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>