Merge remote-tracking branch 'origin/master'

[civicrm-core.git] / xml / templates / civicrm_state_province.tpl

diff --git a/xml/templates/civicrm_state_province.tpl b/xml/templates/civicrm_state_province.tpl
index af6c153ae48f67767c821ca86a933617eb80b263..c6c29075915a2fb9d0dee8b83ced8b63f0c604ea 100644 (file)
--- a/xml/templates/civicrm_state_province.tpl
+++ b/xml/templates/civicrm_state_province.tpl
@@ -1548,7 +1548,7 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
 (3063, 1102, "JT", "Jawa Tengah"),
 (3064, 1102, "JI", "Jawa Timur"),
 (3065, 1102, "KB", "Kalimantan Barat"),
-(3066, 1102, "KT", "Kalimantan Timur"),
+(3066, 1102, "KI", "Kalimantan Timur"), -- updated abbreviation
 (3067, 1102, "KS", "Kalimantan Selatan"),
 (3068, 1102, "KR", "Kepulauan Riau"),
 (3069, 1102, "LA", "Lampung"),
@@ -3913,6 +3913,15 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
 -- Add missing Peruvian State (Amazonas)
 (NULL, 1169, "AMA", "Amazonas"),
 
+<<<<<<< HEAD
+-- Add missing Indonesian provinces (Kalimantan Tengah, Sulawesi Barat, Kalimantan Utara) and revised outdated names in code above
+(NULL, 1102, "KT", "Kalimantan Tengah"), -- added, updated abbreviation
+(NULL, 1102, "SR", "Sulawesi Barat"), -- added, updated abbreviation
+(NULL, 1102, "KU", "Kalimantan Utara"); -- added
+
+=======
 -- Add missing Indonesian provinces (Kalimantan Tengah, Sulawesi Barat) and revised outdated names in code above
-(NULL, 1102, "KLTG", "Kalimantan Tengah"), -- added
-(NULL, 1102, "SLBT", "Sulawesi Barat"); -- added
+(NULL, 1102, "KT", "Kalimantan Tengah"), -- added, updated abbreviation
+(NULL, 1102, "SR", "Sulawesi Barat") -- added, updated abbreviation
+(NULL, 1102, "KU", "Kalimantan Utara"); -- added
+>>>>>>> origin/master