Fixed minor "writing" errors in utils.py and utilsplot.py

alchemyst / Skogestad-Python

Python code for "Multivariable Feedback Control"

111 stars 88 forks source link

Fixed minor "writing" errors in utils.py and utilsplot.py #268

Closed DrakennekarD closed 7 years ago

DrakennekarD commented 7 years ago

After making the changes I ran the "runall.py" program and everything executed the same as before I made the changes.

alchemyst commented 7 years ago

You have not updated your fork with the latest changes made by other people. Please merge with upstream as explained here

DrakennekarD commented 7 years ago

Did I fix what needed to be fixed to enable the pull request to go through?

alchemyst commented 7 years ago

I think you may have some unresolved merge errors. The tests aren't running. You also need to run utils.py to check if that all works. There would have been a message displayed about unresolved merge problems after you merged. There are instructions for merge conflicts here.