Skip to content

Commit

Permalink
Fix upstream conflicts (#32)
Browse files Browse the repository at this point in the history
* bump x.y.z version to even y prior to creation of RELEASE_3_18 branch

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

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

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

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

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

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

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

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

* Version bump to rebuild classes derived from `DotPlot`.

* update github action

---------

Co-authored-by: J Wokaty <[email protected]>
Co-authored-by: J Wokaty <[email protected]>

* Resolve conflict with upstream (#30)

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

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

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

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

---------

Co-authored-by: J Wokaty <[email protected]>
Co-authored-by: J Wokaty <[email protected]>

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

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

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

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

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

---------

Co-authored-by: J Wokaty <[email protected]>
Co-authored-by: J Wokaty <[email protected]>

---------

Co-authored-by: J Wokaty <[email protected]>
Co-authored-by: J Wokaty <[email protected]>
  • Loading branch information
3 people authored Oct 1, 2024
1 parent 29fd791 commit 2b9a32a
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 2b9a32a

Please sign in to comment.