fixing merge issues for comment tweaks

2012-07-31 16:55:02 +01:00
parent 2611c1f27a 8a34aa5077
commit 30175c2a52
21 changed files with 65 additions and 74 deletions
--- a/application/language/nl/pagination.php
+++ b/application/language/nl/pagination.php
@@ -16,4 +16,4 @@ return array(
 	'previous' => '&laquo; Vorige',
 	'next'     => 'Volgende &raquo;',

-);
+);