Projects >> lorsource >>c334fce8e97539e70d747a70ebe7d5cae9c60ae4

Chunk
Conflicting content 
        throw new RuntimeException(e);
      }

<<<<<<< HEAD
      if (author.getScore()>=50) {
        return ParserUtil.bb2xhtml(message, includeCut, getLink(), db);
=======
      if (author.getScore()>=100) {
        return ParserUtil.bb2xhtml(message, includeCut, false, getLink(), db);
>>>>>>> 9fed1b6d52fd78b6268b1d0d4b0253f14b375a48
      } else {
        BBCodeProcessor proc = new BBCodeProcessor();
        return proc.preparePostText(db, message);
Solution content 
        throw new RuntimeException(e);
      }

      if (author.getScore()>=50) {
        return ParserUtil.bb2xhtml(message, includeCut, false, getLink(), db);
      } else {
        BBCodeProcessor proc = new BBCodeProcessor();
        return proc.preparePostText(db, message);
File
Message.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation
Return statement
Chunk
Conflicting content 
  }

  private static String getProcessedMessage(Connection db, String message, User author) throws SQLException {
<<<<<<< HEAD
    if (author.getScore()>=50) {
      return ParserUtil.bb2xhtml(message, true, "", db);
=======
    if (author.getScore()>=100) {
      return ParserUtil.bb2xhtml(message, true, true, "", db);
>>>>>>> 9fed1b6d52fd78b6268b1d0d4b0253f14b375a48
    } else {
      BBCodeProcessor proc = new BBCodeProcessor();
      return proc.preparePostText(db, message);
Solution content 
  }

  private static String getProcessedMessage(Connection db, String message, User author) throws SQLException {
    if (author.getScore()>=50) {
      return ParserUtil.bb2xhtml(message, true, true, "", db);
    } else {
      BBCodeProcessor proc = new BBCodeProcessor();
      return proc.preparePostText(db, message);
File
PreparedComment.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation
Return statement