Merge remote-tracking branch 'origin/master'

Conflicts:
	xml/templates/civicrm_state_province.tpl

diff --cc xml/templates/civicrm_state_province.tpl
index c1ac600d0a52bdbf31e9586def9a6edc0847231b,638b904a6e2997e7cfbea1b6a917169aea4245ab..c6c29075915a2fb9d0dee8b83ced8b63f0c604ea
--- 1/xml/templates/civicrm_state_province.tpl
--- 2/xml/templates/civicrm_state_province.tpl
+++ b/xml/templates/civicrm_state_province.tpl
@@@ -3913,8 -3913,7 +3913,15 @@@ INSERT INTO civicrm_state_province (id
  -- 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, "KT", "Kalimantan Tengah"), -- added, updated abbreviation
+ (NULL, 1102, "SR", "Sulawesi Barat") -- added, updated abbreviation
+ (NULL, 1102, "KU", "Kalimantan Utara"); -- added
++>>>>>>> origin/master