diff options
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/mergeresolution/PostMergeDialog.java b/plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/mergeresolution/PostMergeDialog.java index 9eec6987a..cf097938a 100644 --- a/plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/mergeresolution/PostMergeDialog.java +++ b/plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/mergeresolution/PostMergeDialog.java @@ -33,7 +33,7 @@ import org.eclipse.ui.model.WorkbenchLabelProvider; /** * Dialog for displaying a dialog after resolving a merge conflict. * - * @author <mborkowski@eclipsesource.com> + * @author Michael Borkowski <mborkowski@eclipsesource.com> */ public class PostMergeDialog extends Dialog { /** diff --git a/plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/mergeresolution/PostMergeStager.java b/plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/mergeresolution/PostMergeStager.java index 215c31fe8..87221a793 100644 --- a/plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/mergeresolution/PostMergeStager.java +++ b/plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/mergeresolution/PostMergeStager.java @@ -38,7 +38,7 @@ import org.eclipse.ui.PlatformUI; /** * Responsible for prompting the user about staging files after merge conflict resolution. * - * @author <mborkowski@eclipsesource.com> + * @author Michael Borkowski <mborkowski@eclipsesource.com> */ @SuppressWarnings({"restriction" }) public class PostMergeStager implements IMergeResolutionListener { |