Missed conflict resolved from merge

Marius Cramer

2014-02-18 030bb96e51a32a7c425bdb29db9716bfbe458922

1
2
3
4
5
6
7
<?php
$wb["list_head_txt"] = 'ISPConfig Log';
$wb["tstamp_txt"] = 'Date';
$wb["server_id_txt"] = 'Server';
$wb["loglevel_txt"] = 'Loglevel';
$wb["message_txt"] = 'Message';
?>