From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Tue, 6 Aug 2013 15:38:58 +0000 (+0200)
Subject: minor conflict fixed
X-Git-Tag: myslice-0.2-1~74
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=5e7a8cc34122f08c80efb3f995db87a5de7a3840

minor conflict fixed
---

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