From be5b9515b36c54483baf3c8c52e364eb0d4cae6c Mon Sep 17 00:00:00 2001 From: Frederic Cervenansky Date: Tue, 6 Oct 2009 12:46:45 +0000 Subject: [PATCH] resolve a conflit --- appli/creaNewProject/creaNewProject.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/appli/creaNewProject/creaNewProject.cpp b/appli/creaNewProject/creaNewProject.cpp index f66f2a5..889faad 100644 --- a/appli/creaNewProject/creaNewProject.cpp +++ b/appli/creaNewProject/creaNewProject.cpp @@ -35,14 +35,9 @@ bool myApp::OnInit( ) #else std::string command("creaNewProject.sh "); #endif -<<<<<<< creaNewProject.cpp - command += "\"" + crea::wx2std(dir) + "\"" +" " + crea::wx2std(name); -======= command += "\"" + crea::wx2std(dir) + "\" \"" + crea::wx2std(name) + "\""; command1 += "\"" + crea::wx2std(dir)+"\\"+crea::wx2std(name)+"\\CMakeLists.txt.in\" " + "PROJECT_NAME " + crea::wx2std(name) + "> \"" + crea::wx2std(dir)+"\\"+crea::wx2std(name)+"\\CMakeLists.txt\""; command2 += "\"" + crea::wx2std(dir)+"\\"+crea::wx2std(name)+"\\CMakeLists.txt.in\""; ->>>>>>> 1.3 - if ( ! system ( command.c_str() ) ) { -- 2.49.0