X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FOpenImageDialog.cxx;h=88ebdd363493988a80a2a33ca16b8ad48f556e05;hb=96facb2168314bc57826afc4342abd43e27f0ff7;hp=9d8ac5193a24788520d6f5353eaead108a86c3c5;hpb=c1e89e18066d5e91ecb17dc0e27f8032feebdd12;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx
index 9d8ac51..88ebdd3 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx
@@ -37,12 +37,7 @@ namespace creaMaracasVisuKernel{
 
 			if (FD->ShowModal()==wxID_OK)
 			{
-<<<<<<< OpenImageDialog.cxx
-//				std::string  path= FD->GetPath();
-				std::string  path= (const char*) (FD->GetPath().mb_str()); 
-=======
 				std::string  path= crea::wx2std(FD->GetPath());
->>>>>>> 1.2
 
 				vtkMetaImageReader *reader =  vtkMetaImageReader::New();
 				reader->SetFileName(path.c_str());