From: Younies Mahmoud <younies.mahmoud@gmail.com>
Date: Fri, 8 May 2020 11:36:10 +0000 (+0200)
Subject: merge units-staging
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9ea561c53363efca69456bd47fdbc0a214315a5c;p=icu

merge units-staging
---

9ea561c53363efca69456bd47fdbc0a214315a5c
diff --cc icu4c/source/i18n/unitsdata.cpp
index 7d1fb67ed88,457533277cd..f676caa170d
--- a/icu4c/source/i18n/unitsdata.cpp
+++ b/icu4c/source/i18n/unitsdata.cpp
@@@ -16,7 -15,16 +16,20 @@@ U_NAMESPACE_BEGI
  
  namespace {
  
++<<<<<<< HEAD
 +using icu::number::impl::DecimalQuantity;
++=======
+ void trimSpaces(CharString& factor, UErrorCode& status){
+    CharString trimmed;
+    for (int i = 0 ; i < factor.length(); i++) {
+        if (factor[i] == ' ') continue;
+ 
+        trimmed.append(factor[i], status);
+    }
+ 
+    factor = std::move(trimmed);
+ }
++>>>>>>> 9bcc4b698ff4b2afbf321188bceff809a27342f2
  
  /**
   * A ResourceSink that collects conversion rate information.