ICU-7015 Minor fix.

X-SVN-Rev: 28189
2010-06-14 21:52:52 +00:00 · 2010-06-14 21:52:52 +00:00 · 2b7c82ac5b
commit 2b7c82ac5b
parent e7aba40a67
1 changed files with 0 additions and 1 deletions
--- a/icu4c/source/test/cintltst/cmsccoll.c
+++ b/icu4c/source/test/cintltst/cmsccoll.c
@ -5664,7 +5664,6 @@ static void TestInvalidListsAndRanges(void)
    length = u_unescape(invalidRules[rule_no], rule, 500);
    if (length == 0) {
        log_err("ERROR: The rule cannot be unescaped: %s\n");
->>>>>>> .merge-right.r28177
        return;
    }
    myCollation = ucol_openRules(rule, length, UCOL_ON, UCOL_TERTIARY, &parse_error, &status);