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

diff --git a/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsTensorsVisu.bbs b/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsTensorsVisu.bbs
index 461c370..37abe99 100644
--- 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