Fixed mismerge when bringing split-3.6 up-to-date

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

ecl/eclcmd/eclcmd_core.cpp

@@ -141,7 +141,7 @@ private:
 
 
 
-bool doDeploy(EclCmdWithEclTarget &cmd, IClientWsWorkunits *client, const char *cluster, const char *name, StringBuffer *wuid, bool displayWuid=true)
+bool doDeploy(EclCmdWithEclTarget &cmd, IClientWsWorkunits *client, const char *cluster, const char *name, StringBuffer *wuid, bool noarchive, bool displayWuid=true)
 {
     StringBuffer s;
     if (cmd.optVerbose)