X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk_creaVtk_PKG%2Fbbs%2Fboxes%2FPlaneVectorVisu_Widget.bbg;h=aca1f166181ba14cd6d15eb686feabf8ea6a600e;hb=f0b9ff5192075ba6a5bffdb0c0180e22df4f7351;hp=74b8602e57fc3eba79f7761af0341bef12e12c7d;hpb=3582c0f9b8380fde739856aa6a188da3262cf03b;p=creaVtk.git

diff --git a/bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbg b/bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbg
index 74b8602..aca1f16 100644
--- a/bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbg
+++ b/bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbg
@@ -1,10 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBG BlackBox Diagram file
-<<<<<<< HEAD
-# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbg
-=======
 # - /tmpEED/creaTools/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbg
->>>>>>> master
 # ----------------------------------
 
 APP_START
@@ -32,14 +28,6 @@ COMPLEX_PORT
 renderer
 -52.117833:88.203991:-900.000000
 FIN_COMPLEX_PORT
-<<<<<<< HEAD
-BOXES:8
-BOX
-creaVtk:VectorsVisu:Box00
-ISEXEC:FALSE
--2.817636:-56.941435:-900.000000
-34.807364:-66.941435:-900.000000
-=======
 COMPLEX_PORT
 boxexecute
 -104.232070:88.823851:-900.000000
@@ -50,7 +38,6 @@ creaVtk:VectorsVisu:Box00
 ISEXEC:FALSE
 -4.465574:-69.418679:-900.000000
 41.109426:-79.418679:-900.000000
->>>>>>> master
 FIN_BOX
 BOX
 creaVtk:PlaneWidget:Box01
@@ -100,9 +87,6 @@ ISEXEC:FALSE
 -79.072661:-36.761184:-900.000000
 -37.897661:-46.761184:-900.000000
 FIN_BOX
-<<<<<<< HEAD
-CONNECTIONS:21
-=======
 BOX
 std:MagicBox:Box11
 ISEXEC:FALSE
@@ -110,7 +94,6 @@ ISEXEC:FALSE
 -70.729953:39.494646:-900.000000
 FIN_BOX
 CONNECTIONS:22
->>>>>>> master
 CONNECTION
 Box03:Out:Box00:In
 NumberOfControlPoints:0
@@ -172,13 +155,9 @@ CONNECTION
 Box15:Out:Box13:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
-<<<<<<< HEAD
-Box01:BoxChange:Box15:In2
-=======
 boxexecute:boxexecute:Box11:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
 Box11:Out:Box15:In2
->>>>>>> master
 NumberOfControlPoints:0
 APP_END