From: Pascale Noyret <pascale.noyret@edf.fr>
Date: Fri, 19 Jun 2009 08:57:44 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: V1_0OpenTurns~89
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f422b4e687b06eda0883bb12a5d4eeffa34c21c0;p=modules%2Feficas.git

*** empty log message ***
---

diff --git a/Aster/Cata/cataSTA8/cata.py b/Aster/Cata/cataSTA8/cata.py
index c313e98f..c79c6c2e 100755
--- a/Aster/Cata/cataSTA8/cata.py
+++ b/Aster/Cata/cataSTA8/cata.py
@@ -35,11 +35,6 @@ except:
   pass
 
 __version__="$Name:  $"
-<<<<<<< cata.py
-__Id__="$Id: cata.py,v 1.7 2009-06-19 08:36:49 pnoyret Exp $"
-=======
-__Id__="$Id: cata.py,v 1.5.4.4 2009-06-02 14:17:48 pnoyret Exp $"
->>>>>>> 1.5.4.4
 
 EnumTypes = (ListType, TupleType)
 
diff --git a/Aster/Cata/cataSTA9/SD/utilsd.py b/Aster/Cata/cataSTA9/SD/utilsd.py
index 7735bcd5..01726a8d 100644
--- a/Aster/Cata/cataSTA9/SD/utilsd.py
+++ b/Aster/Cata/cataSTA9/SD/utilsd.py
@@ -23,11 +23,6 @@
    Utilitaire sur le catalogue des structures de données.
 """
 
-<<<<<<< utilsd.py
-__revision__ = "$Id: utilsd.py,v 1.5 2009-06-19 08:36:49 pnoyret Exp $"
-=======
-__revision__ = "$Id: utilsd.py,v 1.3.4.3 2009-04-30 14:38:01 pnoyret Exp $"
->>>>>>> 1.3.4.3
 
 import sys
 import os
diff --git a/Aster/Cata/cataSTA9/cata.py b/Aster/Cata/cataSTA9/cata.py
index 4fdc56a7..40b41c33 100644
--- a/Aster/Cata/cataSTA9/cata.py
+++ b/Aster/Cata/cataSTA9/cata.py
@@ -23,11 +23,6 @@
 from __future__ import division
 
 __version__ = "$Name:  $"
-<<<<<<< cata.py
-__Id__ = "$Id: cata.py,v 1.5 2009-06-19 08:36:49 pnoyret Exp $"
-=======
-__Id__ = "$Id: cata.py,v 1.3.4.5 2009-06-02 15:18:51 pnoyret Exp $"
->>>>>>> 1.3.4.5
 
 import Accas
 from Accas import *