deleted duplicate lines from failed sync issue

diff --git a/xml/templates/civicrm_state_province.tpl b/xml/templates/civicrm_state_province.tpl
index c6c29075915a2fb9d0dee8b83ced8b63f0c604ea..39beca3c08644ea85f85d904aa3354d1c290a6ad 100644 (file)
--- a/xml/templates/civicrm_state_province.tpl
+++ b/xml/templates/civicrm_state_province.tpl
@@ -3913,15 +3913,7 @@ 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, "KT", "Kalimantan Tengah"), -- added, updated abbreviation
-(NULL, 1102, "SR", "Sulawesi Barat") -- added, updated abbreviation
-(NULL, 1102, "KU", "Kalimantan Utara"); -- added
->>>>>>> origin/master
+(NULL, 1102, "KU", "Kalimantan Utara"); -- added
\ No newline at end of file