diff options
| author | supriya <sp.sawant14@gmail.com> | 2014-08-28 15:00:58 +0530 |
|---|---|---|
| committer | supriya <sp.sawant14@gmail.com> | 2014-08-28 15:00:58 +0530 |
| commit | f3a5aec8d7f7997fc7b0b98ca862b1d78a28830c (patch) | |
| tree | 3045a5f65842846890cac5133ba37c0cc8ba4e88 /gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py | |
| parent | 6fe70d3f0a10778a53107435f4d4bef3940027f3 (diff) | |
| parent | 4c15f1586b1e8b03c94f84bbbd2d29edbb8ee263 (diff) | |
| download | gnowsys-f3a5aec8d7f7997fc7b0b98ca862b1d78a28830c.tar.gz | |
conflict resolved
Diffstat (limited to 'gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py')
| -rw-r--r-- | gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py index b0ac0bce..f587e890 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py @@ -112,8 +112,8 @@ urlpatterns = patterns('', name='password_reset' ), + (r'^accounts/', include('registration_email.backends.default.urls')), url(r'^accounts/register/$', RegistrationView.as_view(form_class=UserRegistrationForm)), - (r'^accounts/', include('registration.backends.default.urls')), - + url(r'^Beta/', TemplateView.as_view(template_name= 'gstudio/beta.html'), name="beta"), ) |