Missed conflict resolved from merge

Marius Cramer

2014-02-18 030bb96e51a32a7c425bdb29db9716bfbe458922

1
2
3
4
5
6
<?php
$wb['faq_faq_txt'] = "Frequently Asked Questions";
$wb['faq_question_txt'] = "Question";
$wb['faq_answer_txt'] = "Answer";
$wb['faq_section_txt'] = "Section";
?>