diff options
Diffstat (limited to 'plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/AttributeConflictBuilder.java')
-rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/AttributeConflictBuilder.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/AttributeConflictBuilder.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/AttributeConflictBuilder.java index 8a539836a00..64ab2f499cd 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/AttributeConflictBuilder.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/AttributeConflictBuilder.java @@ -45,9 +45,8 @@ public class AttributeConflictBuilder extends ConflictBuilder { return null; } } - AttributeConflict attributeConflict = - new AttributeConflict(sourceGamma, destGamma, artId, toTransactionId, null, sourceValue, attrId, attrTypeId, - mergeBranch, sourceBranch, destBranch); + AttributeConflict attributeConflict = new AttributeConflict(sourceGamma, destGamma, artId, toTransactionId, null, + sourceValue, attrId, attrTypeId, mergeBranch, sourceBranch, destBranch); if (attributeConflict.getChangeItem().toString().equals("Word Ole Data")) { return null; } else if (attributeConflict.getAttributeType().equals(CoreAttributeTypes.RelationOrder)) { |