0021762: Integration of new Boolean Operation algorithm to OCCT. Small corrections.

diff --git a/tests/boolean/bsection/O6 b/tests/boolean/bsection/O6
index 3e0fea3b3bf109405842883840b5d5b4d0724446..a88d3e1dc3ac90429636b1bffa02d421487b2eac 100644 (file)
--- 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