From: Cédric Aguerre <cedric.aguerre@edf.fr>
Date: Fri, 30 Oct 2015 08:27:51 +0000 (+0100)
Subject: merge conflict
X-Git-Tag: simple_cmake~2^2~11
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b6c89e5886e9b348c00d3d6c23a265f89613cbc7;p=tools%2Fmedcoupling.git

merge conflict
---

b6c89e5886e9b348c00d3d6c23a265f89613cbc7