diff options
| author | jmisinco | 2016-08-26 16:42:05 +0000 |
|---|---|---|
| committer | donald.g.dunne | 2016-09-02 00:21:28 +0000 |
| commit | dc7ba49b07fb727736ecbb9219c59339df1fa519 (patch) | |
| tree | 13ccbec116155af165109bf201fa17338c89ec9d /plugins/org.eclipse.osee.ats | |
| parent | 976bc5781ec9f1d946f1603a27a773064c6147fe (diff) | |
| download | org.eclipse.osee-dc7ba49b07fb727736ecbb9219c59339df1fa519.tar.gz org.eclipse.osee-dc7ba49b07fb727736ecbb9219c59339df1fa519.tar.xz org.eclipse.osee-dc7ba49b07fb727736ecbb9219c59339df1fa519.zip | |
bug[ats_ATS311007]: Merge view will not show
Change-Id: Ic2a03c51f005336e31684641f36394d264980b89
Diffstat (limited to 'plugins/org.eclipse.osee.ats')
| -rw-r--r-- | plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/CommitXManager.java | 2 |
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 6a8afb20d89..c20a2afd877 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()); } } } |