summaryrefslogtreecommitdiff
path: root/ELECTRIC_MACHINERY/chapter8.ipynb
diff options
context:
space:
mode:
authorhardythe12015-04-07 16:03:32 +0530
committerhardythe12015-04-07 16:03:32 +0530
commitcb2e12cd79d48ebbf281b9b118fd51f532f960f5 (patch)
tree45fe0db1bd1a6c81305a0369c5808456fdccde52 /ELECTRIC_MACHINERY/chapter8.ipynb
parentc7fe425ef3c5e8804f2f5de3d8fffedf5e2f1131 (diff)
parent0ee873700378b995b441b1be6652178f741aea5b (diff)
downloadPython-Textbook-Companions-cb2e12cd79d48ebbf281b9b118fd51f532f960f5.tar.gz
Python-Textbook-Companions-cb2e12cd79d48ebbf281b9b118fd51f532f960f5.tar.bz2
Python-Textbook-Companions-cb2e12cd79d48ebbf281b9b118fd51f532f960f5.zip
add/modify/remove book
Diffstat (limited to 'ELECTRIC_MACHINERY/chapter8.ipynb')
-rwxr-xr-xELECTRIC_MACHINERY/chapter8.ipynb3
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",