X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk_creaVtk_PKG%2Fbbs%2Fappli%2FexampleVectorsTensorsVisu.bbs;h=461c370cddb56b09c8a1024b23fb21abf529404d;hb=3582c0f9b8380fde739856aa6a188da3262cf03b;hp=7cf6bd9b1c292fc030e44473e0c49f5568917b0a;hpb=823ab4c462ef8415b8b47db2dea851e7ffe0c868;p=creaVtk.git

diff --git a/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsTensorsVisu.bbs b/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsTensorsVisu.bbs
index 7cf6bd9..461c370 100644
--- a/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsTensorsVisu.bbs
+++ b/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsTensorsVisu.bbs
@@ -63,11 +63,19 @@ 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