From ddb461f596d9f013afe4f215fabc0eabc62b1fb0 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 07 Jan 2014 10:28:05 -0500
Subject: [PATCH] Merge remote-tracking branch 'origin/stable-3.0.5'

---
 interface/web/designer/lib/admin.conf.php |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/interface/web/designer/lib/admin.conf.php b/interface/web/designer/lib/admin.conf.php
index 8dce5a5..6eff33c 100644
--- a/interface/web/designer/lib/admin.conf.php
+++ b/interface/web/designer/lib/admin.conf.php
@@ -1,4 +1,4 @@
-<?php
-
-
-?>
\ No newline at end of file
+<?php
+
+
+?>

--
Gitblit v1.9.1