resolve a conflit

diff --git a/appli/creaNewProject/creaNewProject.cpp b/appli/creaNewProject/creaNewProject.cpp
index f66f2a54006d6c6e867fd9558f4ddd112a3d73ea..889faadc015edd1a552940fa8afa854f5460e492 100644 (file)
--- 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() ) )
      {