Change-Id: I5526edca9816b90f5df2d7f14f24f11d3f5d2ead Signed-off-by: Shawn O. Pearce <spearce@spearce.org>tags/v0.7.0
@@ -1,5 +1,6 @@ | |||
/* | |||
* Copyright (C) 2009, Christian Halstrick <christian.halstrick@sap.com> | |||
* Copyright (C) 2010, Google Inc. | |||
* and other copyright owners as documented in the project's IP log. | |||
* | |||
* This program and the accompanying materials are made available | |||
@@ -71,7 +72,7 @@ public class MergeChunk { | |||
* conflicting chunks. It's a subsequent one. | |||
*/ | |||
NEXT_CONFLICTING_RANGE | |||
}; | |||
} | |||
private final int sequenceIndex; | |||