WIP

author Anthony Geay <anthony.geay@edf.fr>

Wed, 10 Mar 2021 10:17:08 +0000 (11:17 +0100)

committer Anthony Geay <anthony.geay@edf.fr>

Wed, 10 Mar 2021 10:17:08 +0000 (11:17 +0100)
author Anthony Geay <anthony.geay@edf.fr>
Wed, 10 Mar 2021 10:17:08 +0000 (11:17 +0100)
committer Anthony Geay <anthony.geay@edf.fr>
Wed, 10 Mar 2021 10:17:08 +0000 (11:17 +0100)
diff --cc src/CTestTestfileInstall.cmake

index 9f6527fd420dc53f880b05fd6d233dcf1973fc4f,e9ca661316adc9e94d1fe473256a369460c6543f..d5af3be1ec674c4d7882dc9ff481f44c2ede8f5a
--- 1/src/CTestTestfileInstall.cmake
--- 2/src/CTestTestfileInstall.cmake
+++ b/src/CTestTestfileInstall.cmake
@@@ -27,5 -27,4 +27,8 @@@ SUBDIRS(ConnectorAP
           HDFs
           FeaturesPlugin
           ConstructionPlugin
++<<<<<<< HEAD
+ +        SketchPlugin
++=======
++>>>>>>> 1b131e186e0924f233cdfac8d052622740da30e8
   )
author	Anthony Geay <anthony.geay@edf.fr>
	Wed, 10 Mar 2021 10:17:08 +0000 (11:17 +0100)
committer	Anthony Geay <anthony.geay@edf.fr>
	Wed, 10 Mar 2021 10:17:08 +0000 (11:17 +0100)