Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into statesp_constructor_doc
  • Loading branch information
murrayrm authored Jan 2, 2018
commit 6e3c2dda4b19c2a5d598cc8b593c9dc628b8e978
1 change: 0 additions & 1 deletion control/xferfcn.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ class TransferFunction(LTI):
non-zero value, then it must match whenever two transfer functions are
combined. If 'dt' is set to True, the system will be treated as a
discrete time system with unspecified sampling time.

"""

def __init__(self, *args):
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.