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 2b2cf3384d408185f14edad3d544b4c876df1dea..1127b89a90d437ab5c9b06c3380d27908fb88f9c 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 enum ConflictState { * conflicting chunks. It's a subsequent one. */ NEXT_CONFLICTING_RANGE - }; + } private final int sequenceIndex;