From: Frederic Cervenansky <Frederic.Cervenansky@creatis.insa-lyon.fr>
Date: Tue, 6 Oct 2009 12:46:45 +0000 (+0000)
Subject: resolve a conflit
X-Git-Tag: CREATOOLS.2-0-3~63
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=be5b9515b36c54483baf3c8c52e364eb0d4cae6c;p=crea.git

resolve a conflit
---

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() ) )
      {