X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk_creaVtk_PKG%2Fbbs%2Fappli%2FexampleVectorsVisu.bbs;h=03a4658a0bc7b291a052017b0728dc0ab122d1e3;hb=6b5dabc10fd9780f19f7ce0ee287a9f8d9a09267;hp=5998d4858ac81ac32b758e922ff9aee49d3a42b5;hpb=3582c0f9b8380fde739856aa6a188da3262cf03b;p=creaVtk.git

diff --git a/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsVisu.bbs b/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsVisu.bbs
index 5998d48..03a4658 100644
--- a/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsVisu.bbs
+++ b/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsVisu.bbs
@@ -1,10 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBS BlackBox Script
-<<<<<<< HEAD
-# - /tmpEED/creaTools2/ci/bin/../share/bbtk/bbs/creaVtk/appli/exampleVectorsVisu.bbs
-=======
 # - /tmpEED/creaTools/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsVisu.bbs
->>>>>>> master
 # ----------------------------------
 
 # BBTK GEditor Script
@@ -23,11 +19,7 @@ description "Description ??"
 category "<VOID>"
 
 new vtk:MaskPoint Box01
-<<<<<<< HEAD
-  set Box01.Ratio "30"
-=======
   set Box01.Ratio "1"
->>>>>>> master
 
 new creaVtk:VectorsVisu Box02
   set Box02.Active "true"
@@ -49,17 +41,10 @@ new vtk:LoadHola Box07
 new vtk:StructuredPointsReader Box08
   set Box08.In "/home/davila/Creatis/creaVtk/data/Vectors.vtk"
 
-<<<<<<< HEAD
-new std:ConcatStrings Box09
-  set Box09.In2 "/creaVtk/Vectors.vtk"
-
-new std:Configuration Box10
-=======
 new std:Configuration Box09
 
 new std:ConcatStrings Box10
   set Box10.In2 "/creaVtk/Vectors.vtk"
->>>>>>> master
 
 
 connect Box01.Out Box02.In
@@ -76,15 +61,9 @@ connect Box07.Out Box03.In
 
 connect Box08.Out Box01.In
 
-<<<<<<< HEAD
-connect Box10.DataPath Box09.In1
-
-connect Box09.Out Box08.In
-=======
 connect Box09.DataPath Box10.In1
 
 connect Box10.Out Box08.In
->>>>>>> master