organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-07 22:44:49 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-11872 I can't svn very well (actually resolves conflict this time)

Browse source 
X-SVN-Rev: 38466
This commit is contained in:
kazède king 2016-03-02 22:48:21 +00:00
parent 47a0d7975f
commit 4a45deb1ac
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
icu4c/source/i18n/dtptngen.cpp
View file

@ -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