Missed conflict resolved from merge

Marius Cramer

2014-02-18 030bb96e51a32a7c425bdb29db9716bfbe458922

 server/plugins-available/cron_plugin.inc.php

@@ -232,11 +232,7 @@

               $command .= "\t";
               if($job['type'] != 'chrooted' && substr($job['command'], 0, 1) != "/") $command .= $this->parent_domain['document_root'].'/';
<<<<<<< HEAD
               $command .= $job['command'] . " " . $log_target;
=======
               $command .= $job['command'];
>>>>>>> origin/stable-3.0.5
            }

            if($job['type'] == 'chrooted') {