From: Anthony Geay <anthony.geay@edf.fr>
Date: Wed, 10 Mar 2021 10:17:08 +0000 (+0100)
Subject: WIP
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9457953a49270b2dc975cf99b09fa6c176ac8993;p=modules%2Fshaper.git

WIP
---

9457953a49270b2dc975cf99b09fa6c176ac8993
diff --cc src/CTestTestfileInstall.cmake
index 9f6527fd4,e9ca66131..d5af3be1e
--- a/src/CTestTestfileInstall.cmake
+++ b/src/CTestTestfileInstall.cmake
@@@ -27,5 -27,4 +27,8 @@@ SUBDIRS(ConnectorAP
          HDFs
          FeaturesPlugin
          ConstructionPlugin
++<<<<<<< HEAD
 +        SketchPlugin
++=======
++>>>>>>> 1b131e186e0924f233cdfac8d052622740da30e8
  )