diff options
author | hardythe1 | 2015-04-07 16:03:32 +0530 |
---|---|---|
committer | hardythe1 | 2015-04-07 16:03:32 +0530 |
commit | ba4d7bfd00d268a9a5fbdee8938f9a4b5a04851d (patch) | |
tree | fcc60b142916d4a738807d3de7ed170b3f9818f6 /ELECTRIC_MACHINERY/chapter8.ipynb | |
parent | 92cca121f959c6616e3da431c1e2d23c4fa5e886 (diff) | |
parent | 121f6027864eec574ad581705eb277e19120720c (diff) | |
download | Python-Textbook-Companions-ba4d7bfd00d268a9a5fbdee8938f9a4b5a04851d.tar.gz Python-Textbook-Companions-ba4d7bfd00d268a9a5fbdee8938f9a4b5a04851d.tar.bz2 Python-Textbook-Companions-ba4d7bfd00d268a9a5fbdee8938f9a4b5a04851d.zip |
add/modify/remove book
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", |