From bd68aae78a5d696e4ccb9c0d267486c283a6d9d2 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 18 Oct 2013 08:49:59 -0400
Subject: [PATCH] Resolved differences from svn merge to trunk and git master

---
 server/cron_daily.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/server/cron_daily.php b/server/cron_daily.php
index 19fe2ad..1e0f238 100644
--- a/server/cron_daily.php
+++ b/server/cron_daily.php
@@ -2,4 +2,4 @@
 
 # the cron daily file is no longer used and was replaced by cron.php
 
-?>
+?>
\ No newline at end of file

--
Gitblit v1.9.1