From 83aa23b76fbdca327c52bd14fc1a1bc62aa5b3ee Mon Sep 17 00:00:00 2001
From: Dominik <info@profi-webdesign.com>
Date: Wed, 21 Jan 2015 18:55:41 -0500
Subject: [PATCH] Merge branch 'master' of git.ispconfig.org:renky/ispconfig3

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

diff --git a/interface/web/vm/lib/admin.conf.php b/interface/web/vm/lib/admin.conf.php
index a45d440..acb6c35 100644
--- a/interface/web/vm/lib/admin.conf.php
+++ b/interface/web/vm/lib/admin.conf.php
@@ -1,2 +1,2 @@
-<?php
-?>
\ No newline at end of file
+<?php
+?>

--
Gitblit v1.9.1