Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmisinco2016-08-26 12:42:05 -0400
committerdonald.g.dunne2016-09-01 20:21:28 -0400
commitdc7ba49b07fb727736ecbb9219c59339df1fa519 (patch)
tree13ccbec116155af165109bf201fa17338c89ec9d
parent976bc5781ec9f1d946f1603a27a773064c6147fe (diff)
downloadorg.eclipse.osee-dc7ba49b07fb727736ecbb9219c59339df1fa519.tar.gz
org.eclipse.osee-dc7ba49b07fb727736ecbb9219c59339df1fa519.tar.xz
org.eclipse.osee-dc7ba49b07fb727736ecbb9219c59339df1fa519.zip
bug[ats_ATS311007]: Merge view will not show
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/CommitXManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/CommitXManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/CommitXManager.java
index 6a8afb20d8..c20a2afd87 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/CommitXManager.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/CommitXManager.java
@@ -145,7 +145,7 @@ public class CommitXManager extends XViewer {
}
// merge manager
else {
- AtsBranchManager.showMergeManager(xCommitManager.getTeamArt(), branch);
+ AtsBranchManager.showMergeManager(xCommitManager.getTeamArt());
}
}
}

Back to the top