Fixed conflict in /auth/views.py.
authorAaron Williamson <aaron@copiesofcopies.org>
Tue, 4 Oct 2011 00:01:14 +0000 (20:01 -0400)
committerAaron Williamson <aaron@copiesofcopies.org>
Tue, 4 Oct 2011 00:01:14 +0000 (20:01 -0400)
commit43199340a25ab0aa252796f1c865e9ebf0e96649
tree36ce24fa3992d4646d2c7835399e2eddc55f7612
parent3b74ce94ff90e0bd5b214891becb62a6fc503434
parent4d7a93a49303344830021bab5a741148b1adb7c3
Fixed conflict in /auth/views.py.
mediagoblin/auth/views.py