From 63856d4f56e68f4b31fb2b6422a8e9908ee500ef Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Thu, 19 Sep 2013 18:01:49 -0500
Subject: [PATCH] Fixing error caused by merge (failure to build password
 editing url)

This commit sponsored by Kim Lindberger.  Thank you!
---
 mediagoblin/templates/mediagoblin/edit/edit_account.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediagoblin/templates/mediagoblin/edit/edit_account.html b/mediagoblin/templates/mediagoblin/edit/edit_account.html
index f9e75890..574fe459 100644
--- a/mediagoblin/templates/mediagoblin/edit/edit_account.html
+++ b/mediagoblin/templates/mediagoblin/edit/edit_account.html
@@ -60,7 +60,7 @@
     </a>
     {% if pass_auth is defined %}
       &middot;
-      <a href="{{ request.urlgen('mediagoblin.edit.pass') }}">
+      <a href="{{ request.urlgen('mediagoblin.plugins.basic_auth.edit.pass') }}">
         {% trans %}Password{% endtrans %}
       </a>
     {% endif %}
-- 
2.25.1