From f50294461b6d59f051bfebc68271155c47a7d4d8 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Wed, 6 Jan 2010 11:22:57 -0800 Subject: [PATCH] Remove unnecessary semicolon in MergeChunk Change-Id: I5526edca9816b90f5df2d7f14f24f11d3f5d2ead Signed-off-by: Shawn O. Pearce --- org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeChunk.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 2b2cf3384..1127b89a9 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 + * 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 enum ConflictState { * conflicting chunks. It's a subsequent one. */ NEXT_CONFLICTING_RANGE - }; + } private final int sequenceIndex;