diff options
Diffstat (limited to 'plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ConflictManagerExternal.java')
| -rw-r--r-- | plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ConflictManagerExternal.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/ConflictManagerExternal.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ConflictManagerExternal.java index b86d1c68e6d..d01aa5b0151 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ConflictManagerExternal.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ConflictManagerExternal.java @@ -39,9 +39,8 @@ public class ConflictManagerExternal { public List<Conflict> getOriginalConflicts() throws OseeCoreException { if (originalConflicts == null) { - originalConflicts = - ConflictManagerInternal.getConflictsPerBranch(sourceBranch, destinationBranch, - sourceBranch.getBaseTransaction(), monitor); + originalConflicts = ConflictManagerInternal.getConflictsPerBranch(sourceBranch, destinationBranch, + sourceBranch.getBaseTransaction(), monitor); } return originalConflicts; } |