minor conflict fixed
authorYasin <mohammed-yasin.rahman@lip6.fr>
Tue, 6 Aug 2013 15:38:58 +0000 (17:38 +0200)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Tue, 6 Aug 2013 15:38:58 +0000 (17:38 +0200)
commit5e7a8cc34122f08c80efb3f995db87a5de7a3840
treea9545a9f36a82457b1c584022b7d512a2f79a223
parent05861f44a20edf11bacba3d0d6fad3dee9ad7957
minor conflict fixed
portal/views.py