Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2007-09-18 15:36:09 +0000
committerMichael Valenta2007-09-18 15:36:09 +0000
commit830a633f5b6e8e3664be68f0f8333c3394fae6d8 (patch)
tree40c244806700b215cb7a73491dc5be0383a1be9e /bundles/org.eclipse.team.core/src/org/eclipse/team/core/Team.java
parenta7e28b2f35b2bb61b7386fa20227b764d2065885 (diff)
downloadeclipse.platform.team-830a633f5b6e8e3664be68f0f8333c3394fae6d8.tar.gz
eclipse.platform.team-830a633f5b6e8e3664be68f0f8333c3394fae6d8.tar.xz
eclipse.platform.team-830a633f5b6e8e3664be68f0f8333c3394fae6d8.zip
Bug 136330 [API] DelegatingStorageMerger should be API
Diffstat (limited to 'bundles/org.eclipse.team.core/src/org/eclipse/team/core/Team.java')
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/Team.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/Team.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/Team.java
index f9c4fdc45..8e4283a78 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/Team.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/Team.java
@@ -491,7 +491,7 @@ public final class Team {
*
* @since 3.4
*/
- public IStorageMerger createMerger(String extension) {
+ public static IStorageMerger createMerger(String extension) {
return StorageMergerRegistry.getInstance().createStreamMerger(extension);
}

Back to the top