diff options
Diffstat (limited to 'ELECTRIC_MACHINERY/chapter8.ipynb')
| -rwxr-xr-x | ELECTRIC_MACHINERY/chapter8.ipynb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ELECTRIC_MACHINERY/chapter8.ipynb b/ELECTRIC_MACHINERY/chapter8.ipynb index 97079356..d938905f 100755 --- a/ELECTRIC_MACHINERY/chapter8.ipynb +++ b/ELECTRIC_MACHINERY/chapter8.ipynb @@ -304,7 +304,10 @@ "input": [ "from __future__ import division\n", "%matplotlib inline\n", +<<<<<<< HEAD "from matplotlib.pyplot import *\n", +======= +>>>>>>> 0ee873700378b995b441b1be6652178f741aea5b "\n", "#Variavle declaration:\n", "rpm=2500 #rpm of motor\n", |