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/?a=commitdiff_plain;h=5e7a8cc34122f08c80efb3f995db87a5de7a3840;hp=5e7a8cc34122f08c80efb3f995db87a5de7a3840;p=myslice.git

minor conflict fixed
---