From 074718390f7ce5cf8692e7bdeff68ea2197926c4 Mon Sep 17 00:00:00 2001
From: Sashi20
Date: Mon, 17 Sep 2018 15:05:23 +0530
Subject: Resolved merge conflict in navbar template regarding namespace

---
 nccps2018/wsgi.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'nccps2018/wsgi.py')

diff --git a/nccps2018/wsgi.py b/nccps2018/wsgi.py
index 25a3f46..f91acc6 100644
--- a/nccps2018/wsgi.py
+++ b/nccps2018/wsgi.py
@@ -8,9 +8,17 @@ https://docs.djangoproject.com/en/2.1/howto/deployment/wsgi/
 """
 
 import os
+import sys
 
-from django.core.wsgi import get_wsgi_application
 
+
+sys.path.append('/Sites/nccps_2018/nccps-2018')
+sys.path.insert(1, '/Sites/nccps_2018/nccps-2018')
+sys.path.insert(1, '/Sites/nccps_2018/env_nccps/lib/python3.6/site-packages')
+
+activate_this = '/Sites/nccps_2018/env_nccps/bin/activate_this.py'
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'nccps2018.settings')
 
+from django.core.wsgi import get_wsgi_application
 application = get_wsgi_application()
+
-- 
cgit