diff options
Diffstat (limited to 'examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/MergeAction.java')
| -rw-r--r-- | examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/MergeAction.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/MergeAction.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/MergeAction.java index 28ea4f954..6f3c51e49 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/MergeAction.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/MergeAction.java @@ -22,7 +22,7 @@ import org.eclipse.team.ui.synchronize.ModelMergeOperation; * This merge action is contributed as a a popupmenu objectContribution in * the plugin.xml. You can change the value return from {@link #isUseSyncFramework()} * to try out different dialogs. - * + * * @since 3.2 */ public class MergeAction extends FileSystemAction { |