fixed conflict

This commit is contained in:
koenr 2007-03-01 20:27:00 +00:00
parent 31f6834e36
commit 635bb616fa

View File

@ -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';