From 5e7a8cc34122f08c80efb3f995db87a5de7a3840 Mon Sep 17 00:00:00 2001
From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Tue, 6 Aug 2013 17:38:58 +0200
Subject: [PATCH] minor conflict fixed

---
 portal/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/portal/views.py b/portal/views.py
index 5b4399db..3fa62ffc 100644
--- 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
 
-- 
2.43.0