From 29fd79160f87379ec0e0bf289e5454aa1d1693e3 Mon Sep 17 00:00:00 2001
From: Kevin Rue-Albrecht <kevinrue67@gmail.com>
Date: Tue, 1 Oct 2024 18:27:12 +0100
Subject: [PATCH] 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 <jennifer.wokaty@sph.cuny.edu>
Co-authored-by: J Wokaty <jwokaty@users.noreply.github.com>