Projects information

Chunk

Conflicting content
String[] tones = new String[3]; Pattern accent_pattern = <<<<<<< HEAD Pattern.compile( "(L\\+H\\\|L\\\\+H\|L\\\|H\\\|!H\\\|L\\+!H\\\|L\\\\+!H\|H\\+!H\\\|X\\\|H\\+L\\\|H+L\\\|.+\\+\|\\+.+)"); ======= Pattern.compile("(L\\+H\\\|L\\\\+H\|L\\\|H\\\|!H\\\|L\\+!H\\\|L\\\\+!H\|H\\+!H\\\|X\\\|\\(H\\+L\\)\\\|H\\+L\\\|H+L\\*\|.+\\+\|\\+.+)"); >>>>>>> 0f2cb5b15acb2bed660479603f5cbe0aa96b21ef Matcher accent_matcher = accent_pattern.matcher(label); if (accent_matcher.find()) { tones[0] = accent_matcher.group();

Conflicting content

    String[] tones = new String[3];

    Pattern accent_pattern =
<<<<<<< HEAD
        Pattern.compile(
            "(L\\+H\\*|L\\*\\+H|L\\*|H\\*|!H\\*|L\\+!H\\*|L\\*\\+!H|H\\+!H\\*|X\\*|H\\+L\\*|H+L\\*|.+\\+|\\+.+)");
=======
        Pattern.compile("(L\\+H\\*|L\\*\\+H|L\\*|H\\*|!H\\*|L\\+!H\\*|L\\*\\+!H|H\\+!H\\*|X\\*|\\(H\\+L\\)\\*|H\\+L\\*|H+L\\*|.+\\+|\\+.+)");
>>>>>>> 0f2cb5b15acb2bed660479603f5cbe0aa96b21ef
    Matcher accent_matcher = accent_pattern.matcher(label);
    if (accent_matcher.find()) {
      tones[0] = accent_matcher.group();

Solution content
String[] tones = new String[3]; Pattern accent_pattern = Pattern.compile( "(L\\+H\\\|L\\\\+H\|L\\\|H\\\|!H\\\|L\\+!H\\\|L\\\\+!H\|H\\+!H\\\|X\\\|\\(H\\+L\\)\\\|H\\+L\\\|H+L\\\|.+\\+\|\\+.+)"); Matcher accent_matcher = accent_pattern.matcher(label); if (accent_matcher.find()) { tones[0] = accent_matcher.group();

Solution content

    String[] tones = new String[3];

    Pattern accent_pattern =
        Pattern.compile(
            "(L\\+H\\*|L\\*\\+H|L\\*|H\\*|!H\\*|L\\+!H\\*|L\\*\\+!H|H\\+!H\\*|X\\*|\\(H\\+L\\)\\*|H\\+L\\*|H+L\\*|.+\\+|\\+.+)");
    Matcher accent_matcher = accent_pattern.matcher(label);
    if (accent_matcher.find()) {
      tones[0] = accent_matcher.group();

File
ToBIUtils.java

Developer's decision
Version 2

Kind of conflict
Method invocation

Projects >> AuToBI >>d6d4d35e6e2d5ec06d323fc195fb7911cca7bed8