diff options
| author | Michael Valenta | 2004-10-07 18:25:15 +0000 |
|---|---|---|
| committer | Michael Valenta | 2004-10-07 18:25:15 +0000 |
| commit | 654b84b5b8fb74cdd723a26e8d8ce8927fa61cde (patch) | |
| tree | aed099f1a845eaea018d4cd95d64d04d74f3a093 /bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizeParticipant.java | |
| parent | 8f1e8cf64a9de86d7b62b7d7e61906a6306c1b5c (diff) | |
| download | eclipse.platform.team-654b84b5b8fb74cdd723a26e8d8ce8927fa61cde.tar.gz eclipse.platform.team-654b84b5b8fb74cdd723a26e8d8ce8927fa61cde.tar.xz eclipse.platform.team-654b84b5b8fb74cdd723a26e8d8ce8927fa61cde.zip | |
Generalized change sets
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizeParticipant.java')
| -rw-r--r-- | bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizeParticipant.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizeParticipant.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizeParticipant.java index 4c6e0dfe1..16ce5a9af 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizeParticipant.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizeParticipant.java @@ -262,9 +262,6 @@ public class MergeSynchronizeParticipant extends CVSParticipant { configuration.setSupportedModes(ISynchronizePageConfiguration.INCOMING_MODE | ISynchronizePageConfiguration.CONFLICTING_MODE); configuration.setMode(ISynchronizePageConfiguration.INCOMING_MODE); configuration.addActionContribution(new MergeParticipantActionContribution()); - - // The manager adds itself to the configuration in it's constructor - new ChangeLogModelManager(configuration); } /* (non-Javadoc) |