Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve conflict with upstream (#30) #31

Merged
merged 1 commit into from
Oct 1, 2024
Merged

Resolve conflict with upstream (#30) #31

merged 1 commit into from
Oct 1, 2024

Conversation

kevinrue
Copy link
Member

@kevinrue kevinrue commented Oct 1, 2024

  • 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


* 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>
@kevinrue kevinrue merged commit 29fd791 into devel Oct 1, 2024
4 of 6 checks passed
@kevinrue kevinrue deleted the kra-merge branch October 1, 2024 17:27
kevinrue added a commit that referenced this pull request Oct 1, 2024
* 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>
kevinrue added a commit that referenced this pull request Oct 1, 2024
* 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 <jennifer.wokaty@sph.cuny.edu>
Co-authored-by: J Wokaty <jwokaty@users.noreply.github.com>

* 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>

* 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>

---------

Co-authored-by: J Wokaty <jennifer.wokaty@sph.cuny.edu>
Co-authored-by: J Wokaty <jwokaty@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant