From 2b9a32afc6e1c87eeaf19956f3354766885de75f Mon Sep 17 00:00:00 2001 From: Kevin Rue-Albrecht Date: Tue, 1 Oct 2024 19:51:30 +0100 Subject: [PATCH] Fix upstream conflicts (#32) * 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 Co-authored-by: J Wokaty * 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 Co-authored-by: J Wokaty * 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 Co-authored-by: J Wokaty --------- Co-authored-by: J Wokaty Co-authored-by: J Wokaty