Missed conflict resolved from merge

Marius Cramer

2014-02-18 030bb96e51a32a7c425bdb29db9716bfbe458922

 interface/web/admin/lib/lang/nl_server_config_list.lng

@@ -1,5 +1,4 @@
<?php

$wb['list_head_txt'] = 'Server configuratie';

$wb['server_name_txt'] = 'Servernaam';

?>



<?php
$wb['list_head_txt'] = 'Server configuratie';
$wb['server_name_txt'] = 'Server';
?>