From ce6e1ddfd09c47fc3f80e4fccc238894cf560ddb Mon Sep 17 00:00:00 2001
From: A. Täffner <darkalex@firesplash.de>
Date: Fri, 22 Jan 2016 13:16:39 -0500
Subject: [PATCH] updated master, resolved conflicts

---
 interface/web/sites/lib/lang/de_web_folder_user_list.lng |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/interface/web/sites/lib/lang/de_web_folder_user_list.lng b/interface/web/sites/lib/lang/de_web_folder_user_list.lng
index 2db8eb0..c9bcb9c 100644
--- a/interface/web/sites/lib/lang/de_web_folder_user_list.lng
+++ b/interface/web/sites/lib/lang/de_web_folder_user_list.lng
@@ -3,5 +3,5 @@
 $wb['active_txt'] = 'Aktiv';
 $wb['web_folder_id_txt'] = 'Ordner';
 $wb['username_txt'] = 'Benutzername';
-$wb["add_new_record_txt"] = 'Ordner Benutzer hinzufügen';
+$wb['add_new_record_txt'] = 'Ordner Benutzer hinzufügen';
 ?>

--
Gitblit v1.9.1