[sagenb] 38/179: forgot to delete a line while merging

[felix salfelder]

This is an automated email from the git hooks/post-receive script.

felix-guest pushed a commit to branch master
in repository sagenb.

commit 470094ef3b337632d9f1c34b8d8399730e6b4727
Author: Robin Martinjak <rob at rmartinjak.de>
Date:   Fri Nov 2 19:24:52 2012 +0100

    forgot to delete a line while merging
---
 sagenb/data/sage/html/settings/user_management.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sagenb/data/sage/html/settings/user_management.html b/sagenb/data/sage/html/settings/user_management.html
index 1255304..8feb85d 100644
--- a/sagenb/data/sage/html/settings/user_management.html
+++ b/sagenb/data/sage/html/settings/user_management.html
@@ -21,7 +21,6 @@
       {% if u.username() != 'admin' %}
       <tr>
          <td><a href="/home/{{ u }}/">{{ u }}</a></td>
-         <td>{% if not user.is_external() %}<a href="/users/?reset={{ user }}">{{ gettext('Reset') }}</a>{% endif %}</td>
          <td>
             {% if not u.is_external() %}
             <a href="{{ url_for('users', reset=u.username()) }}">{{ gettext('Reset') }}</a>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagenb.git