Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/pydantic1' into pydantic1
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/tickit/adapters/zeromq/push_adapter.py
#	tests/adapters/zeromq/test_push_adapter.py
#	tests/utils/test_configurable.py
  • Loading branch information
DiamondJoseph committed Jul 18, 2023
2 parents 93eb948 + 2f06f68 commit 26c19aa
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 26c19aa

Please sign in to comment.