Missed conflict resolved from merge

Marius Cramer

2014-02-18 030bb96e51a32a7c425bdb29db9716bfbe458922

1
2
3
4
5
<?php 
$wb["list_head_txt"] = 'Email templates'; 
$wb["template_type_txt"] = 'Message for'; 
$wb["template_name_txt"] = 'Template name'; 
?>