Commit 83d062d6 authored by Daniel Lehmberg's avatar Daniel Lehmberg
Browse files

Merge branch 'testing_fixed_delta' into refactor_control_systems 

# Conflicts:
#	datafold/appfold/edmd.py
#	datafold/pcfold/kernels.py
#	datafold/pcfold/tests/test_tsc_collection.py
#	datafold/utils/_systems.py
parents 694dfbb0 6a243849
Expand all Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment