*** empty log message ***

diff --git a/Aster/Cata/cataSTA8/cata.py b/Aster/Cata/cataSTA8/cata.py
index c313e98f9f07f4f35314bcb099a897d1586451b1..c79c6c2eec8e757616e261b2e32d44eb26f11e23 100755 (executable)
--- 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 7735bcd5a453d05e5ca21c783adaf52ab87ef665..01726a8d825c051065cb146308c452e504a591bf 100644 (file)
--- 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 4fdc56a78219fdf2371a70619f4b7afe61902a46..40b41c338ea9f627f57bd41dc8434467e1c46e94 100644 (file)
--- 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 *