diff options
Diffstat (limited to 'examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncMergePart.java')
| -rw-r--r-- | examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncMergePart.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncMergePart.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncMergePart.java index b24ea3e75..aa6fa1e80 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncMergePart.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncMergePart.java @@ -37,9 +37,9 @@ import org.eclipse.team.ui.mapping.ISynchronizationCompareInput; */ public class NonSyncMergePart extends PageSaveablePart { - private final NoSyncModelMergePage page; + private final NonSyncModelMergePage page; - protected NonSyncMergePart(Shell shell, CompareConfiguration compareConfiguration, NoSyncModelMergePage page) { + protected NonSyncMergePart(Shell shell, CompareConfiguration compareConfiguration, NonSyncModelMergePage page) { super(shell, compareConfiguration); this.page = page; } |