diff options
Diffstat (limited to 'examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModelMerger.java')
| -rw-r--r-- | examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModelMerger.java | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModelMerger.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModelMerger.java index 7ddbe9a34..6dc403b0e 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModelMerger.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModelMerger.java @@ -57,17 +57,11 @@ public class ModelMerger extends ResourceMappingMerger { this.provider = provider; } - /* (non-Javadoc) - * @see org.eclipse.team.core.mapping.ResourceMappingMerger#getModelProvider() - */ @Override protected org.eclipse.core.resources.mapping.ModelProvider getModelProvider() { return provider; } - /* (non-Javadoc) - * @see org.eclipse.team.core.mapping.ResourceMappingMerger#merge(org.eclipse.team.core.mapping.IMergeContext, org.eclipse.core.runtime.IProgressMonitor) - */ @Override public IStatus merge(IMergeContext mergeContext, IProgressMonitor monitor) throws CoreException { try { |