diff --git a/icu4c/source/i18n/dtptngen.cpp b/icu4c/source/i18n/dtptngen.cpp index ca0eedcd875..b505b84c0a8 100644 --- a/icu4c/source/i18n/dtptngen.cpp +++ b/icu4c/source/i18n/dtptngen.cpp @@ -589,12 +589,6 @@ void DateTimePatternGenerator::getAllowedHourFormats(const Locale &locale, UErro fAllowedHourFormats[0] = ALLOWED_HOUR_FORMAT_H; fAllowedHourFormats[1] = ALLOWED_HOUR_FORMAT_UNKNOWN; } -<<<<<<< .mine - -======= - ures_close(countryData); - ures_close(rb); ->>>>>>> .r38464 } UnicodeString