Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/StorageMergerRegistry.java')
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/StorageMergerRegistry.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/StorageMergerRegistry.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/StorageMergerRegistry.java
index 27f3f40f1..4c6095879 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/StorageMergerRegistry.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/StorageMergerRegistry.java
@@ -97,11 +97,11 @@ public class StorageMergerRegistry {
// collect all IStreamMergers
IConfigurationElement[] elements= registry.getConfigurationElementsFor(TeamPlugin.ID, STORAGE_MERGER_EXTENSION_POINT);
for (int i= 0; i < elements.length; i++) {
- IConfigurationElement element= elements[i];
- if (STORAGE_MERGER.equals(element.getName()))
- register(element, new StorageMergerDescriptor(element));
- else if (CONTENT_TYPE_BINDING.equals(element.getName()))
- createBinding(element, STORAGE_MERGER_ID_ATTRIBUTE);
+ IConfigurationElement element= elements[i];
+ if (STORAGE_MERGER.equals(element.getName()))
+ register(element, new StorageMergerDescriptor(element));
+ else if (CONTENT_TYPE_BINDING.equals(element.getName()))
+ createBinding(element, STORAGE_MERGER_ID_ATTRIBUTE);
}
}

Back to the top