From: Shane F. Carr <shane@unicode.org>
Date: Fri, 17 Jan 2020 16:32:52 +0000 (+0100)
Subject: Move measunit_extra.o to avoid merge conflict
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=778565e94ec01e3e49459dedf273bca600420774;p=icu

Move measunit_extra.o to avoid merge conflict
---

diff --git a/icu4c/source/i18n/Makefile.in b/icu4c/source/i18n/Makefile.in
index f6f9860fb3a..8f197d89b1a 100644
--- a/icu4c/source/i18n/Makefile.in
+++ b/icu4c/source/i18n/Makefile.in
@@ -97,7 +97,7 @@ uspoof.o uspoof_impl.o uspoof_build.o uspoof_conf.o smpdtfst.o \
 ztrans.o zrule.o vzone.o fphdlimp.o fpositer.o ufieldpositer.o \
 decNumber.o decContext.o alphaindex.o tznames.o tznames_impl.o tzgnames.o \
 tzfmt.o compactdecimalformat.o gender.o region.o scriptset.o \
-uregion.o reldatefmt.o quantityformatter.o measunit.o \
+uregion.o reldatefmt.o quantityformatter.o measunit.o measunit_extra.o \
 sharedbreakiterator.o scientificnumberformatter.o dayperiodrules.o nounit.o \
 number_affixutils.o number_compact.o number_decimalquantity.o \
 number_decimfmtprops.o number_fluent.o number_formatimpl.o number_grouping.o \
@@ -114,8 +114,7 @@ numparse_symbols.o numparse_decimal.o numparse_scientific.o numparse_currency.o
 numparse_affixes.o numparse_compositions.o numparse_validators.o \
 numrange_fluent.o numrange_impl.o \
 erarules.o \
-formattedvalue.o formattedval_iterimpl.o formattedval_sbimpl.o formatted_string_builder.o \
-measunit_extra.o
+formattedvalue.o formattedval_iterimpl.o formattedval_sbimpl.o formatted_string_builder.o
 
 ## Header files to install
 HEADERS = $(srcdir)/unicode/*.h