Missed conflict resolved from merge

Marius Cramer

2014-02-18 030bb96e51a32a7c425bdb29db9716bfbe458922

1
2
3
4
5
6
7
<?php
$wb['interface_head_txt'] = 'Interface Settings';
$wb['interface_desc_txt'] = 'Modify your interface';
$wb['language_txt'] = 'Language';
$wb['startmodule_txt'] = 'Startmodule';
$wb['app_theme_txt'] = 'Design';
?>