Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EditAttributeWizardPage.java')
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EditAttributeWizardPage.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EditAttributeWizardPage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EditAttributeWizardPage.java
index 7eb136c501a..ac2d04d0026 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EditAttributeWizardPage.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EditAttributeWizardPage.java
@@ -86,9 +86,8 @@ public class EditAttributeWizardPage extends WizardPage {
this.conflict = conflict;
changeType = conflict.getAttributeType().getName();
if (!conflict.isWordAttribute()) {
- editor =
- EmbededAttributeEditorFactory.getEmbeddedEditor(conflict.getAttributeType(),
- conflict.getSourceDisplayData(), Arrays.asList(conflict), true);
+ editor = EmbededAttributeEditorFactory.getEmbeddedEditor(conflict.getAttributeType(),
+ conflict.getSourceDisplayData(), Arrays.asList(conflict), true);
}
} catch (OseeCoreException ex) {
OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);

Back to the top