Resolved merge conflict in navbar template regarding namespace

1 files changed, 3 insertions, 3 deletions

diff --git a/website/views.py b/website/views.py
index 444c8f9..22896fd 100644
--- a/website/views.py
+++ b/website/views.py
@@ -170,7 +170,7 @@ def view_abstracts(request):
 def user_login(request):
     user = request.user
     if request.user.is_authenticated:
-        return redirect('/proposal/')
+        return redirect('/nccps-2018/proposal/')
     else:
         if request.method == "POST":
             context = {}
@@ -183,7 +183,7 @@ def user_login(request):
                 login(request, user)
                 proposals = Proposal.objects.filter(user=request.user).count()
                 context['user'] = user
-                return redirect('/proposal')
+                return redirect('/nccps-2018/proposal')
                 #template = loader.get_template('index.html')
                 #return render(request, 'index.html', context)
             else:
@@ -988,4 +988,4 @@ def view_profile(request):
                 logout(request)
                 return redirect('/login/')
             except:
-                return redirect('/register/')
\ No newline at end of file
+                return redirect('/register/')