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/admin/lib/lang/pl_software_repo.lng |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/interface/web/admin/lib/lang/pl_software_repo.lng b/interface/web/admin/lib/lang/pl_software_repo.lng
index 84d9c9e..d11a1b3 100644
--- a/interface/web/admin/lib/lang/pl_software_repo.lng
+++ b/interface/web/admin/lib/lang/pl_software_repo.lng
@@ -5,4 +5,3 @@
 $wb['repo_password_txt'] = 'Hasło (Opcjonalnie)';
 $wb['active_txt'] = 'Aktywny';
 ?>
-

--
Gitblit v1.9.1