[python-control-developers] [python-control/python-control] d35eec: resolve conflict in tests/xferfcn_test.py

[Richard M. <no...@gi...>]

  Branch: refs/heads/master
  Home:   https://github.com/python-control/python-control
  Commit: d35eec66c0a43d375c4f62e793924cf253def5ec
      https://github.com/python-control/python-control/commit/d35eec66c0a43d375c4f62e793924cf253def5ec
  Author: Richard Murray <mu...@cd...>
  Date:   2019-12-31 (Tue, 31 Dec 2019)

  Changed paths:
    M control/bdalg.py
    M control/freqplot.py
    M control/grid.py
    M control/iosys.py
    M control/matlab/wrappers.py
    M control/statefbk.py
    M control/tests/xferfcn_test.py
    M control/xferfcn.py

  Log Message:
  -----------
  resolve conflict in tests/xferfcn_test.py


  Commit: 4785145110352d58dd61ea6a6de31d2ab79095fd
      https://github.com/python-control/python-control/commit/4785145110352d58dd61ea6a6de31d2ab79095fd
  Author: Richard Murray <mu...@cd...>
  Date:   2019-12-31 (Tue, 31 Dec 2019)

  Changed paths:
    M control/bdalg.py
    M control/freqplot.py
    M control/grid.py
    M control/iosys.py
    M control/matlab/wrappers.py
    M control/statefbk.py
    M control/tests/xferfcn_test.py
    M control/xferfcn.py

  Log Message:
  -----------
  Merge branch 'bnavigator-fix-latex'


Compare: https://github.com/python-control/python-control/compare/c36fcc099dec...478514511035