Projects >> fitnesse >>271b15584029a1010dc53e73c85a0a1e36d82fca

Chunk
Conflicting content 
    int itemLength = getLength();
    String item = getString(itemLength);
    List sublist = maybeReadList(item);
<<<<<<< HEAD
    
=======

>>>>>>> db949860133675cc7996b8030d445acac86c4a0d
    if (sublist == null)
      result.add(item);
    else
Solution content 
    int itemLength = getLength();
    String item = getString(itemLength);
    List sublist = maybeReadList(item);

    if (sublist == null)
      result.add(item);
    else
File
ListDeserializer.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
  }

  /**
<<<<<<< HEAD
   * @return the string parsed as a list if possible, null otherwise  
   */
  private List maybeReadList(String string) {
    if (StringUtils.isBlank(string) || !string.startsWith("[")) {
      return null;
    }
    
=======
   * @return the string parsed as a list if possible, null otherwise
   */
  private List maybeReadList(String string) {
    if ("".equals(string.trim()) || !string.startsWith("["))
      return null;

>>>>>>> db949860133675cc7996b8030d445acac86c4a0d
    try {
      return ListDeserializer.deserialize(string);
    } catch (SyntaxError e) {
Solution content 
  }

  /**
   * @return the string parsed as a list if possible, null otherwise
   */
  private List maybeReadList(String string) {
    if ("".equals(string.trim()) || !string.startsWith("["))
      return null;

    try {
      return ListDeserializer.deserialize(string);
    } catch (SyntaxError e) {
File
ListDeserializer.java
Developer's decision
Version 2
Kind of conflict
Comment
If statement
Method signature