summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2010-01-06 11:22:57 -0800
committerShawn O. Pearce <spearce@spearce.org>2010-01-06 11:23:03 -0800
commitf50294461b6d59f051bfebc68271155c47a7d4d8 (patch)
tree91f5c1b29f8afa7affb51469c0a243fab70bc9e3
parent1b4f76d7bc3bf15291391e6aabdca02796232873 (diff)
downloadjgit-f50294461b6d59f051bfebc68271155c47a7d4d8.tar.gz
jgit-f50294461b6d59f051bfebc68271155c47a7d4d8.zip
Remove unnecessary semicolon in MergeChunk
Change-Id: I5526edca9816b90f5df2d7f14f24f11d3f5d2ead Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeChunk.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeChunk.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeChunk.java
index 2b2cf3384d..1127b89a90 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeChunk.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeChunk.java
@@ -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;