package de.wellnerbou.chronic.replay;

import org.joda.time.DateTime;

public class JsonLogLineData {

	public DateTime startTime;
	public DateTime originalTime;
	public int statusCode;
	public String originalStatusCode;
	public Boolean sameStatus;
	public Long duration;
	public Long originalDuration;
	public Long difference;
	public String request;
}

@@ -104,24 +104,22 @@
 %09public 
-DateTime
+String
  startTi
@@ -130,24 +130,22 @@
 %09public 
-DateTime
+String
  origina
@@ -145,16 +145,21 @@
 original
+Start
 Time;%0A%09p

Resolve merge conflicts