git://git.onelab.eu
/
unfold.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fix: merge conflict
[unfold.git]
/
portal
/
registrationview.py
diff --git
a/portal/registrationview.py
b/portal/registrationview.py
index
e85d44f
..
30a0ed3
100644
(file)
--- a/
portal/registrationview.py
+++ b/
portal/registrationview.py
@@
-1,6
+1,6
@@
import os.path, re
-from django.core.mail
import send_mail
+from django.core.mail import send_mail
from django.views.generic import View
from django.template.loader import render_to_string