From 030bb96e51a32a7c425bdb29db9716bfbe458922 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 18 Feb 2014 09:29:31 -0500
Subject: [PATCH] Missed conflict resolved from merge
---
server/plugins-available/cron_plugin.inc.php | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/server/plugins-available/cron_plugin.inc.php b/server/plugins-available/cron_plugin.inc.php
index b37c8ed..d02b1fd 100644
--- a/server/plugins-available/cron_plugin.inc.php
+++ b/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') {
--
Gitblit v1.9.1