Commit e335197c 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/tests/test_tsc_collection.py
#	tutorials/repeat_motor.py
parents 0ddd3203 bd1e1c41
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