From 7c2179f4b8604da1167b29ffb92041cf16fc4dbc Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 13 Mar 2014 07:37:47 -0400
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