From: Ovidiu Mircescu <ovidiu.mircescu@edf.fr>
Date: Mon, 15 Sep 2014 10:02:06 +0000 (+0200)
Subject: Fix a merge issue
X-Git-Tag: V7_5_0a1~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=2aaaab50c28246ddb16e768bc31265a5054a2a9d;p=tools%2Fyacsgen.git

Fix a merge issue
---

diff --git a/module_generator/astcompo.py b/module_generator/astcompo.py
index 731cf32..a99a6a5 100644
--- a/module_generator/astcompo.py
+++ b/module_generator/astcompo.py
@@ -61,8 +61,8 @@ class ASTERComponent(Component):
                                                           exe_path="launch.sh",
                                                           argv=["-memjeveux","4"])
   """
-  def __init__(self, name, services=None, libs=[], rlibs="", aster_dir="", 
-                     python_path=None, argv=None, kind="lib", exe_path=None):
+  def __init__(self, name, services=None, libs="", rlibs="", aster_dir="",
+                     python_path=None, argv=None, kind="lib", exe_path=None, aster_version_type="stable"):
     """initialise component attributes"""
     self.aster_dir = aster_dir
     self.python_path = python_path or []