From f9d064053f5d16430db4d066d3ce3f999085d2b7 Mon Sep 17 00:00:00 2001 From: emv Date: Mon, 22 Oct 2012 09:53:33 +0400 Subject: [PATCH] 0021762: Integration of new Boolean Operation algorithm to OCCT. Small corrections. --- tests/boolean/bsection/O6 | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/boolean/bsection/O6 b/tests/boolean/bsection/O6 index 3e0fea3b3b..a88d3e1dc3 100644 --- a/tests/boolean/bsection/O6 +++ b/tests/boolean/bsection/O6 @@ -1,10 +1,5 @@ restore [locate_data_file pro14151a.rle] a -<<<<<<< HEAD restore [locate_data_file CFI_pro14fjq.rle] b -bsection result b a -2d -======= -restore [locate_data_file pro14151b.rle] b bsection result b a ->>>>>>> a5b92d9... 0021762: Integration of new Boolean Operation algorithm to OCCT. Fixing regressions. set length 49.9609 -- 2.39.5