Projects >> fitnesse >>8ba8b8666b6e50041807fe727674b6b0c2f55f86

Chunk
Conflicting content 
    }
  }

<<<<<<< HEAD
  public static String makeResultFileName(TestSummary summary, long time) {
    SimpleDateFormat format = new SimpleDateFormat(TEST_RESULT_FILE_DATE_PATTERN);
    String datePart = format.format(new Date(time));
    return String.format("%s_%d_%d_%d_%d.xml", datePart, summary.getRight(), summary.getWrong(), summary.getIgnores(), summary.getExceptions());
  }
=======
>>>>>>> b0752cd4eb2ef17b3bbe9cc23ba47411d76808ff
}
Solution content 
    }
  }

  public static String makeResultFileName(TestSummary summary, long time) {
    SimpleDateFormat format = new SimpleDateFormat(TEST_RESULT_FILE_DATE_PATTERN);
    String datePart = format.format(new Date(time));
    return String.format("%s_%d_%d_%d_%d.xml", datePart, summary.getRight(), summary.getWrong(), summary.getIgnores(), summary.getExceptions());
  }
}
File
TestHistory.java
Developer's decision
Version 1
Kind of conflict
Method declaration