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

🐛 missing arguments for ocrd workspace merge #896

Merged
merged 2 commits into from
Aug 14, 2022
Merged

🐛 missing arguments for ocrd workspace merge #896

merged 2 commits into from
Aug 14, 2022

Conversation

kba
Copy link
Member

@kba kba commented Aug 2, 2022

No description provided.

@bertsky
Copy link
Collaborator

bertsky commented Aug 11, 2022

Oops, sry, forgot to include that in my PR. LGTM, thanks!

@kba kba marked this pull request as ready for review August 11, 2022 11:54
@kba
Copy link
Member Author

kba commented Aug 11, 2022

Oh, and I forgot to actually merge this. Welcome back btw :)

# Conflicts:
#	ocrd/ocrd/cli/workspace.py
@kba kba merged commit 092ad09 into master Aug 14, 2022
@kba kba deleted the merge-fix branch September 4, 2022 14:04
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