X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FcreaPanelButtonContainer%2FbuttonContainerSettings.cxx;h=7f96dcf9223f4146ccacd144a96ea061302c526e;hb=8f1f70ffb361d0ccde7da40ff128cebdcfcf3f13;hp=e93c87a03fcc78994b6dda0b3a478429507dd985;hpb=e1c23d053ffe93035f13802efdb19dc116e4b46c;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx
index e93c87a..7f96dcf 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx
@@ -281,9 +281,6 @@ namespace creaPanelButtonContainer
 		}//hctac
 	}
 
-
-//EED-MLER
-/*
 	void
 	ButtonContainerSettings::AddItems(BCPSettingsStruct* info)
 	{
@@ -307,24 +304,6 @@ namespace creaPanelButtonContainer
 		}//yrt
 		catch ( const std::exception& e )
 		{
-<<<<<<< HEAD
-			try
-			{
-				for( BCStructVectorType::iterator it = infoList.begin( ); it
-				    != infoList.end( ); ++it )
-				{
-					this->AddItem(*it);
-				}//rof
-			}//yrt
-			catch ( const std::exception& e )
-			{
-				std::cerr
-			    << "ContainerSettings::AddButtons( BCStructVectorType infoList ) "
-			    << "exception: " << e.what( ) << std::endl;
-			}//hctac
-		}
-*/
-=======
 			std::cerr
 			<< "ButtonContainerSettings::AddButton( BCPSettingsStruct* info )"
 			<< "exception: " << e.what( ) << std::endl;
@@ -339,8 +318,6 @@ namespace creaPanelButtonContainer
 		return m_itemsMap;
 	}
 
->>>>>>> b8c5a565c70ac0def1f21518afa2d847a9582d79
 
 // ----------------------------------------------------------------------------------
 }//ecapseman
-