aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/submit/forms.py
diff options
context:
space:
mode:
authorAaron Williamson <aaron@copiesofcopies.org>2011-10-03 20:01:14 -0400
committerAaron Williamson <aaron@copiesofcopies.org>2011-10-03 20:01:14 -0400
commit43199340a25ab0aa252796f1c865e9ebf0e96649 (patch)
tree36ce24fa3992d4646d2c7835399e2eddc55f7612 /mediagoblin/submit/forms.py
parent3b74ce94ff90e0bd5b214891becb62a6fc503434 (diff)
parent4d7a93a49303344830021bab5a741148b1adb7c3 (diff)
downloadmediagoblin-43199340a25ab0aa252796f1c865e9ebf0e96649.tar.lz
mediagoblin-43199340a25ab0aa252796f1c865e9ebf0e96649.tar.xz
mediagoblin-43199340a25ab0aa252796f1c865e9ebf0e96649.zip
Fixed conflict in /auth/views.py.
Diffstat (limited to 'mediagoblin/submit/forms.py')
-rw-r--r--mediagoblin/submit/forms.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/submit/forms.py b/mediagoblin/submit/forms.py
index a999c714..25d6e304 100644
--- a/mediagoblin/submit/forms.py
+++ b/mediagoblin/submit/forms.py
@@ -17,8 +17,8 @@
import wtforms
-from mediagoblin.util import tag_length_validator
-from mediagoblin.util import fake_ugettext_passthrough as _
+from mediagoblin.tools.text import tag_length_validator
+from mediagoblin.tools.translate import fake_ugettext_passthrough as _
class SubmitStartForm(wtforms.Form):