From 3af1d100145d5b5f60e140856463b2cae5f120aa Mon Sep 17 00:00:00 2001
From: Arne Schauf <arne@as-webservices.de>
Date: Sat, 28 Sep 2013 22:22:42 +0200
Subject: [PATCH] oups - pushed broken things

---
 nsupdate/main/views.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/nsupdate/main/views.py b/nsupdate/main/views.py
index ea13a33..8aaeb2b 100644
--- a/nsupdate/main/views.py
+++ b/nsupdate/main/views.py
@@ -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
+