minor conflict fixed

diff --git a/portal/views.py b/portal/views.py
index 5b4399d..3fa62ff 100644 (file)
--- a/portal/views.py
+++ b/portal/views.py
@@ -30,7 +30,7 @@ from django.shortcuts            import render
 
 from plugins.lists.simplelist    import SimpleList
 
-#from plugins.pres_view           import PresView
+from plugins.pres_view           import PresView
 from portal.event import Event
 import json