diff options
| author | Aaron Williamson <aaron@copiesofcopies.org> | 2011-10-03 20:01:14 -0400 |
|---|---|---|
| committer | Aaron Williamson <aaron@copiesofcopies.org> | 2011-10-03 20:01:14 -0400 |
| commit | 43199340a25ab0aa252796f1c865e9ebf0e96649 (patch) | |
| tree | 36ce24fa3992d4646d2c7835399e2eddc55f7612 /mediagoblin/listings | |
| parent | 3b74ce94ff90e0bd5b214891becb62a6fc503434 (diff) | |
| parent | 4d7a93a49303344830021bab5a741148b1adb7c3 (diff) | |
| download | mediagoblin-43199340a25ab0aa252796f1c865e9ebf0e96649.tar.lz mediagoblin-43199340a25ab0aa252796f1c865e9ebf0e96649.tar.xz mediagoblin-43199340a25ab0aa252796f1c865e9ebf0e96649.zip | |
Fixed conflict in /auth/views.py.
Diffstat (limited to 'mediagoblin/listings')
| -rw-r--r-- | mediagoblin/listings/views.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mediagoblin/listings/views.py b/mediagoblin/listings/views.py index b3384eb4..01aad803 100644 --- a/mediagoblin/listings/views.py +++ b/mediagoblin/listings/views.py @@ -16,7 +16,8 @@ from mediagoblin.db.util import DESCENDING -from mediagoblin.util import Pagination, render_to_response +from mediagoblin.tools.pagination import Pagination +from mediagoblin.tools.response import render_to_response from mediagoblin.decorators import uses_pagination from werkzeug.contrib.atom import AtomFeed |