diff options
Diffstat (limited to 'templates/authopenid/signin.html')
| -rw-r--r-- | templates/authopenid/signin.html | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/templates/authopenid/signin.html b/templates/authopenid/signin.html index 7c234ff3..f8749d2b 100644 --- a/templates/authopenid/signin.html +++ b/templates/authopenid/signin.html @@ -135,15 +135,9 @@ <legend class="big">{% trans "Use login name and password" %}</legend> <div class="form-row"><label for="id_username">{% trans "Login name" %}:</label><br />{{ form1.username }}</div> <div class="form-row"><label for="id_password">{% trans "Password" %}:</label><br />{{ form1.password }}</div> -<<<<<<< HEAD:templates/authopenid/signin.html <div class="submit-row"><input type="submit" class="submit" name="blogin" value="{% trans "Login" %}"> <a href="{%url sendpw%}">{% trans "Forgot your password?" %}</a> - <a href="/registrarse">{% trans "Create new account" %}</a></div> -======= - <div class="submit-row"><input type="submit" class="submit" name="blogin" value="{% trans "Login" %}"/> - <a href="">{% trans "Forgot your password?" %}</a> - <a href="">{% trans "Create new account" %}</a></div> ->>>>>>> master:templates/authopenid/signin.html + <a href="{%url user_signup%}">{% trans "Create new account" %}</a></div> </fieldset> </form> </div> |