Remove unnecessary semicolon in MergeChunk
Change-Id: I5526edca9816b90f5df2d7f14f24f11d3f5d2ead Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
parent
1b4f76d7bc
commit
f50294461b
|
@ -1,5 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (C) 2009, Christian Halstrick <christian.halstrick@sap.com>
|
* 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.
|
* and other copyright owners as documented in the project's IP log.
|
||||||
*
|
*
|
||||||
* This program and the accompanying materials are made available
|
* This program and the accompanying materials are made available
|
||||||
|
@ -71,7 +72,7 @@ public enum ConflictState {
|
||||||
* conflicting chunks. It's a subsequent one.
|
* conflicting chunks. It's a subsequent one.
|
||||||
*/
|
*/
|
||||||
NEXT_CONFLICTING_RANGE
|
NEXT_CONFLICTING_RANGE
|
||||||
};
|
}
|
||||||
|
|
||||||
private final int sequenceIndex;
|
private final int sequenceIndex;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue