1
0
Fork 0
mirror of synced 2024-07-03 05:31:38 +12:00

Fix PR conflicts

This commit is contained in:
Mattia Panzeri 2019-10-01 10:13:22 +02:00
parent a069aabc63
commit 03537f2f39
No known key found for this signature in database
GPG key ID: 7A88169BED1A2831
3 changed files with 228 additions and 228 deletions

View file

@ -20,7 +20,7 @@ return [
'BG' => 'Bulgaria', 'BG' => 'Bulgaria',
'BH' => 'Bahrein', 'BH' => 'Bahrein',
'BS' => 'Bahamas', 'BS' => 'Bahamas',
"BA" => "Bosnia ed Erzegovina", 'BA' => 'Bosnia ed Erzegovina',
'BY' => 'Bielorussia', 'BY' => 'Bielorussia',
'BZ' => 'Belize', 'BZ' => 'Belize',
'BO' => 'Bolivia', 'BO' => 'Bolivia',
@ -29,7 +29,7 @@ return [
'BN' => 'Brunei', 'BN' => 'Brunei',
'BT' => 'Bhutan', 'BT' => 'Bhutan',
'BW' => 'Botswana', 'BW' => 'Botswana',
"CF" => "Repubblica Centrafricana", 'CF' => 'Repubblica Centrafricana',
'CA' => 'Canada', 'CA' => 'Canada',
'CH' => 'Svizzera', 'CH' => 'Svizzera',
'CL' => 'Cile', 'CL' => 'Cile',
@ -94,7 +94,7 @@ return [
'KH' => 'Cambogia', 'KH' => 'Cambogia',
'KI' => 'Kiribati', 'KI' => 'Kiribati',
'KN' => 'Saint Kitts e Nevis', 'KN' => 'Saint Kitts e Nevis',
"KR" => "Corea del Sud", 'KR' => 'Corea del Sud',
'KW' => 'Kuwait', 'KW' => 'Kuwait',
'LA' => 'Laos', 'LA' => 'Laos',
'LB' => 'Libano', 'LB' => 'Libano',