Fix bad merge

[cascardo/ema.git] / eventos / forms.py

diff --git a/eventos/forms.py b/eventos/forms.py
index c739b07..2a46963 100644 (file)
--- a/eventos/forms.py
+++ b/eventos/forms.py
@@ -15,8 +15,8 @@
 # License along with this program; if not, write to the
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
-from django import newforms as forms
-from django.newforms import PasswordInput, ValidationError
+from django import forms
+from django.forms import PasswordInput, ValidationError
 from django.contrib.auth.models import User