commit 6f4d229c8798f22305892a9e2fea890946b34a8e
author rschmitt <rschmitt@ee007c2a-0a25-0410-9ab9-bf268980928c> Tue Mar 09 21:36:10 2010 +0000
committer rschmitt <rschmitt@ee007c2a-0a25-0410-9ab9-bf268980928c> Tue Mar 09 21:36:10 2010 +0000
tree 3808e18396872d8e63041af697744e8f2b0c49e8
parent 3311af1698967b0d1460b6a6be3810475c109494

org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ConflictManagerInternal.java

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ConflictManagerInternal.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ConflictManagerInternal.java
index 812b4ca..ba2a224 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ConflictManagerInternal.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ConflictManagerInternal.java
@@ -210,8 +210,7 @@
       IOseeStatement chStmt = ConnectionHandler.getStatement();

       try {

          chStmt.runPreparedQuery(sql, sourceBranch.getId(), sourceBranch.getBaseTransaction().getId(),

-               destinationBranch.getId(), destinationBranch.getBaseTransaction().getId(),

-               transactionId != null ? transactionId.getId() : 0);

+               destinationBranch.getId(), transactionId != null ? transactionId.getId() : 0);

 

          ArtifactConflictBuilder artifactConflictBuilder;

          int artId = 0;