Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDani Megert2013-05-15 16:11:50 -0400
committerDani Megert2013-05-15 16:11:50 -0400
commitb750b5d75fb9edaad56809e379c4d6e985167396 (patch)
treeda711dd249ead9127a6dbced758e8a2a15575439
parenta293d95118c40d93026a747f8d9bd4e609352a91 (diff)
downloadeclipse.platform.team-b750b5d75fb9edaad56809e379c4d6e985167396.tar.gz
eclipse.platform.team-b750b5d75fb9edaad56809e379c4d6e985167396.tar.xz
eclipse.platform.team-b750b5d75fb9edaad56809e379c4d6e985167396.zip
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java
index a937fff8d..10f9d8a1f 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -291,6 +291,8 @@ public class CVSMergeSubscriber extends CVSSyncTreeSubscriber implements IResour
fireTeamResourceChange(new ISubscriberChangeEvent[] {delta});
}
break;
+ default:
+ break;
}
}
}

Back to the top