Skip to content

Conversation

@MatthewMiddlehurst
Copy link
Member

No description provided.

…g/tsml-py into dev

# Conflicts:
#	pyproject.toml
#	tsml/__init__.py
#	tsml/dummy/_dummy.py
#	tsml/interval_based/_base.py
#	tsml/interval_based/_cif.py
#	tsml/interval_based/_interval_pipelines.py
#	tsml/shapelet_based/_stc.py
#	tsml/transformations/_catch22.py
…g/tsml-py into dev

# Conflicts:
#	pyproject.toml
#	tsml/__init__.py
#	tsml/dummy/_dummy.py
#	tsml/interval_based/__init__.py
#	tsml/interval_based/_base.py
#	tsml/interval_based/_cif.py
#	tsml/interval_based/_stsf.py
#	tsml/transformations/__init__.py
#	tsml/transformations/_periodogram.py
#	tsml/utils/testing.py
…g/tsml-py into dev

# Conflicts:
#	tsml/dummy/_dummy.py
#	tsml/tests/_sklearn_checks.py
@MatthewMiddlehurst MatthewMiddlehurst merged commit 1dad889 into main Apr 20, 2023
@MatthewMiddlehurst MatthewMiddlehurst deleted the dev branch April 20, 2023 11:45
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