From 4a8b7ecdf842a6ba7cdf0339067c6ed285cf60cb Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 12 Jan 2012 05:25:06 -0500
Subject: [PATCH] Fixed merge problems in mysql_clientdb_plugin.inc.php

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

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

--
Gitblit v1.9.1