flo/nsupdate.info
1
0
Fork 0
Code Issues 1 Pull Requests 2 Packages Releases Activity

oups - pushed broken things

Browse Source
This commit is contained in:
Arne Schauf 2013-09-28 22:22:42 +02:00
parent cddda9b6c0
commit 3af1d10014
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nsupdate/main/views.py
View File

@ -41,8 +41,7 @@ def OverviewView(request):
context['HostForm'] = form
return render(request, "main/overview.html", context)
<<<<<<< HEAD
=======
@login_required
def HostView(request,pk=None):
@ -58,4 +57,4 @@ def HostView(request,pk=None):
host = form.save(request.user)
context['HostForm'] = form
return render(request, "main/host.html", context)
>>>>>>> 3b2fa9008fe6aa3d20e7b3ae9504fadedb4165c4