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

backmerge master changes to develop to resolve merge conflicts #683

Merged
merged 24 commits into from
Oct 14, 2022

Conversation

exaexa
Copy link
Collaborator

@exaexa exaexa commented Oct 14, 2022

github.

exaexa and others added 24 commits November 12, 2021 10:26
develop→master for 1.1 release
remove some unnecessarily explicit `Union` types
Regular merge develop→master
Merge the fixed develop to master
...hopefully ending the series of single-version compatibility
fixes once for all.
use the keyword arguments in new version of SBML
This reverts commit 553ed70, reversing
changes made to 39f8d88.
Revert "Merge pull request #544 from LCSB-BioCore/mk-sbml-091"
Develop → master merge for 1.2.1
develop → master merge for 1.2.2
second and hopefully final develop → master merge for 1.2.2
Develop → master merge for 1.2.3
Develop → master merge for 1.4
hotfix: bump CompatHelper version to work with 1.8
@exaexa exaexa requested a review from stelmo October 14, 2022 09:55
@exaexa exaexa merged commit 677b099 into develop Oct 14, 2022
@exaexa exaexa deleted the mk-fix-mergeability branch October 14, 2022 10:05
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.

4 participants