Skip to content
This repository was archived by the owner on Feb 27, 2018. It is now read-only.

Commit 72063f4

Browse files
PythonCHBPythonCHB
committed
Merge branch 'session_09' of https://github.com/Anastomose/IntroToPython into Anastomose-session_09
Conflicts: .gitignore
2 parents ac1ec61 + 71b5b78 commit 72063f4

45 files changed

Lines changed: 1562 additions & 178 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,13 @@ slides_sources/build
33
.DS_Store
44
#ignore compiled files, sublime workspace and project files
55
*.pyc
6+
*junk*
7+
8+
#ignore sublime workspace files
69
*.sublime*
7-
*.*~
810

911
# ignore .gitignore, so we can each have our own.
1012
.gitignore
13+
14+
# editor back-up files
15+
*.*~

‎Examples/Session06/html_render/test_html_output1.html‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎Examples/Session06/html_render/test_html_output2.html‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎Examples/Session06/html_render/test_html_output3.html‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎Examples/Session06/html_render/test_html_output4.html‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎Examples/Session06/html_render/test_html_output5.html‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎Examples/Session06/html_render/test_html_output6.html‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎Examples/Session06/html_render/test_html_output7.html‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎Examples/Session06/html_render/test_html_output8.html‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎Solutions/Session06/run_html_render.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212

1313
# importing the html_rendering code with a short name for easy typing.
14-
import html_render as hr
14+
import html_render_eb as hr
1515
reload(hr) # reloading in case you are running this in iPython
1616
# -- we want to make sure the latest version is used
1717

0 commit comments

Comments
 (0)