From b0642db21a24208d760273697bdebe7f89e7341e Mon Sep 17 00:00:00 2001 From: jsnyder83 Date: Mon, 29 Dec 2014 20:54:41 +0700 Subject: [PATCH] deleted duplicate lines from failed sync issue --- xml/templates/civicrm_state_province.tpl | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/xml/templates/civicrm_state_province.tpl b/xml/templates/civicrm_state_province.tpl index c6c2907591..39beca3c08 100644 --- 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 -- 2.25.1