*** empty log message ***

diff --git a/InterfaceQT4/qtEficas.py b/InterfaceQT4/qtEficas.py
index f794b062a3f2edf21085f6878039d52e8aa4654d..29a7e6b3e0735820760bdbf7a86d06b6080cabf2 100644 (file)
--- a/InterfaceQT4/qtEficas.py
+++ b/InterfaceQT4/qtEficas.py
@@ -32,16 +32,11 @@ class Appli(Ui_Eficas,QMainWindow):
         self.indice=0
         self.dict_reels={}
 
-        self.multi=multi
-<<<<<<< qtEficas.py
         self.RepIcon=os.path.join( os.path.dirname(os.path.abspath(__file__)),'../Editeur/icons')
+        self.multi=multi
         if self.multi == False :
              self.definitCode(code,ssCode)
              if code==None: return
-=======
-        self.RepIcon=os.path.join( os.path.dirname(os.path.abspath(__file__)),'../Editeur/icons')
-        if self.multi == False :self.definitCode(code,ssCode)
->>>>>>> 1.5.4.3.2.17
         eficas_root_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
         self.ajoutIcones()
 

diff --git a/MAP/catalogues_MAP.ini b/MAP/catalogues_MAP.ini
index 7385dfb4f7ff0bf37ec768bd8ac1221a16e03b55..54ad2e2f6194ea6da600cc05d72bda202f6728c5 100644 (file)
--- a/MAP/catalogues_MAP.ini
+++ b/MAP/catalogues_MAP.ini
@@ -11,10 +11,7 @@ catalogues = (
   ('MAP','s_scc_st_2_V1',os.path.join(rep_cata,'s_scc_st_2_V1.py'),'s_scc_pn','MAP'),
   ('MAP','s_rpv2_V0',os.path.join(rep_cata,'s_rpv2_V0.py'),'s_rpv2','MAP'),
   ('MAP','s_DIC_V1',os.path.join(rep_cata,'s_DIC_V1.py'),'s_DIC','MAP'),
-<<<<<<< catalogues_MAP.ini
   ('MAP','s_scc_3d',os.path.join(rep_cata,'s_scc_3d_analysis.py'),'s_DIC','MAP'),
-=======
   ('MAP','c_transverse_empty_python_V1',os.path.join(MAP_DIRECTORY,'components/transverse/c_transverse_empty_python/deploy/c_transverse_empty_python_eficas.py'),'c_transverse_empty_python','MAP'),
->>>>>>> 1.2.4.1.2.2
 )