Code

Fix upstream conflicts#32

Code

Merged

kevinrue merged 7 commits intodeveliSEE/iSEEpathways:develfrom kra-fixiSEE/iSEEpathways:kra-fixCopy head branch name to clipboardOct 1, 2024

+10-6

Commits

Commits on Oct 24, 2023

• bump x.y.z version to even y prior to creation of RELEASE_3_18 branch

  jwokaty

  committed
  23073a9

  Copy full SHA for 23073a9

• bump x.y.z version to odd y following creation of RELEASE_3_18 branch

  jwokaty

  committed
  f39cb2f

  Copy full SHA for f39cb2f

Commits on Apr 30, 2024

• bump x.y.z version to even y prior to creation of RELEASE_3_19 branch

  jwokaty

  committed
  77d3a43

  Copy full SHA for 77d3a43

• bump x.y.z version to odd y following creation of RELEASE_3_19 branch

  jwokaty

  committed
  fbcecb0

  Copy full SHA for fbcecb0

Commits on Oct 1, 2024

• Version bump to rebuild classes derived from DotPlot. (#29)

  Show description for 0d7e45c
  

  kevinrue

  and

  jwokaty

  committed
  0d7e45c

  Copy full SHA for 0d7e45c

• Resolve conflict with upstream (#30)

  Show description for eadc0aa
  

  kevinrue

  and

  jwokaty

  committed
  eadc0aa

  Copy full SHA for eadc0aa

• Resolve conflict with upstream (#30) (#31)

  Show description for f5d63cf
  

  kevinrue

  and

  jwokaty

  committed
  f5d63cf

  Copy full SHA for f5d63cf