From: koenr <koenr>
Date: Thu, 1 Mar 2007 20:27:00 +0000 (+0000)
Subject: fixed conflict
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=635bb616fa6307b7cd869fd1b1c12b92736e4b85;p=moodle.git

fixed conflict
---

diff --git a/lang/en_utf8/currencies.php b/lang/en_utf8/currencies.php
index d709846e83..332134de20 100644
--- a/lang/en_utf8/currencies.php
+++ b/lang/en_utf8/currencies.php
@@ -99,7 +99,7 @@ $string['NPR'] = 'Nepalese Rupee';
 $string['NZD'] = 'New Zealand Dollar';
 $string['OMR'] = 'Omani Rial';
 $string['PAB'] = 'Panamanian Balboa';
-$string['PEN'] = 'Nuevo Sol ';
+$string['PEN'] = 'Nuevo Sol';
 $string['PGK'] = 'Papua New Guinea Kina';
 $string['PHP'] = 'Philippine Peso';
 $string['PKR'] = 'Pakistan Rupee';