Skip to content

Conversation

@ethho
Copy link
Contributor

@ethho ethho commented Dec 5, 2023

@ethho ethho changed the base branch from master to dev-tests December 5, 2023 15:50
@ethho ethho requested a review from A-Baji December 5, 2023 16:05
@ethho ethho marked this pull request as ready for review December 5, 2023 16:05
@ethho
Copy link
Contributor Author

ethho commented Dec 5, 2023

WIP merge conflicts

@ethho
Copy link
Contributor Author

ethho commented Dec 5, 2023

Done resolving conflicts.

import tempfile
from datajoint import errors
from datajoint.errors import ADAPTED_TYPE_SWITCH, FILEPATH_FEATURE_SWITCH
from datajoint.errors import ADAPTED_TYPE_SWITCH, FILEPATH_FEATURE_SWITCH
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in a downstream PR

@ethho ethho merged commit 453e516 into datajoint:dev-tests Dec 5, 2023
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