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

Workspace merge fix #926

Merged
merged 8 commits into from
Oct 21, 2022
Merged

Workspace merge fix #926

merged 8 commits into from
Oct 21, 2022

Conversation

MehmedGIT
Copy link
Contributor

No description provided.

ocrd_models/ocrd_models/ocrd_mets.py Outdated Show resolved Hide resolved
ocrd_models/ocrd_models/ocrd_mets.py Outdated Show resolved Hide resolved
ocrd_models/ocrd_models/ocrd_mets.py Outdated Show resolved Hide resolved
@MehmedGIT
Copy link
Contributor Author

Good to go now. Tests pass, and my Nextflow-related merge tests work as well.

@kba kba merged commit bc9d150 into master Oct 21, 2022
@kba kba deleted the workspace_merge_fix branch October 21, 2022 16:12
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.

2 participants