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