From bd68aae78a5d696e4ccb9c0d267486c283a6d9d2 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 18 Oct 2013 08:49:59 -0400
Subject: [PATCH] Resolved differences from svn merge to trunk and git master

---
 interface/web/admin/lib/lang/fr_server_config_list.lng |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/interface/web/admin/lib/lang/fr_server_config_list.lng b/interface/web/admin/lib/lang/fr_server_config_list.lng
index 04278ff..850cdd1 100644
--- a/interface/web/admin/lib/lang/fr_server_config_list.lng
+++ b/interface/web/admin/lib/lang/fr_server_config_list.lng
@@ -1,5 +1,4 @@
-<?php
-$wb['list_head_txt'] = 'Configuration du serveur';
-$wb['server_name_txt'] = 'Serveur';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Configuration du serveur';
+$wb['server_name_txt'] = 'Serveur';
+?>

--
Gitblit v1.9.1