From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Tue, 6 Apr 2021 12:05:47 +0000 (+0200)
Subject: fix root conflict - master -  bos/23995
X-Git-Tag: V9_7_0~63^2~24
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=009db25fe3247d4dc837c1c62d8256ba03be3d28;p=tools%2Fsat_salome.git

fix root conflict - master -  bos/23995
---

009db25fe3247d4dc837c1c62d8256ba03be3d28
diff --cc products/root.pyconf
index 719066b,3ff73df..e3a8fb6
--- a/products/root.pyconf
+++ b/products/root.pyconf
@@@ -19,20 -19,8 +19,10 @@@ default 
      }
  }
  
- version_6_16_00:
- {}
- 
- version_6_16_00_win:
- {
-     archive_info : {archive_name : "root_v6.16.00-windows.tar.gz"}
-     build_source : "script"
-     compil_script :  "root.bat"
- }
- 
  version_6_22_06:
 -{}
 +{
 +    patches : ['root-6.22.06.patch']
 +}
  
  version_6_22_06_win:
  {
@@@ -54,3 -28,13 +44,15 @@@ version_6_22_02_win
      build_source : "script"
      compil_script :  "root.bat"
  }
+ 
+ version_6_16_00:
+ {}
+ 
+ version_6_16_00_win:
+ {
++
+     archive_info : {archive_name : "root_v6.16.00-windows.tar.gz"}
+     build_source : "script"
+     compil_script :  "root.bat"
+ }
++