3223 creaVtk Feature New Normal - vtk8itk4wx3-mingw64

[creaVtk.git] / bbtk_creaVtk_PKG / bbs / appli / exampleVectorsTensorsVisu.bbs

diff --git a/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsTensorsVisu.bbs b/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsTensorsVisu.bbs
index 461c370cddb56b09c8a1024b23fb21abf529404d..37abe999e69f05b257de14d02bc5fc822bae5cf6 100644 (file)
--- a/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsTensorsVisu.bbs
+++ b/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsTensorsVisu.bbs
@@ -63,19 +63,11 @@ new vtk:StructuredPointsReader Box31
 new vtk:ProbeFilter Box32
   set Box32.BoxProcessMode "Reactive"
 
-<<<<<<< HEAD
-new creaVtk:TensorsVisu_Widget Box33
-
-new wx:LayoutTab Box36
-
-new creaVtk:TensorsVisu_Widget Box37
-=======
 new creaVtk:TensorsVisu_Wideget Box33
 
 new wx:LayoutTab Box36
 
 new creaVtk:TensorsVisu_Wideget Box37
->>>>>>> master
 
 new vtk:MaskPoint Box38