diff options
| author | sarthfrey <sarth.frey@gmail.com> | 2016-01-25 18:26:23 -0500 |
|---|---|---|
| committer | sarthfrey <sarth.frey@gmail.com> | 2016-01-25 18:26:23 -0500 |
| commit | 279c28ce7dcc3f155f71c7a073e939630e8f05b6 (patch) | |
| tree | cd06525da5a4350916143f025b2e5a64a56922aa /python.html.markdown | |
| parent | 299d064ecf7598144e49ef336e0abd00ccc4ae16 (diff) | |
| parent | 928edf12092cea82a9eded6848b8d0b0710a977c (diff) | |
Merge remote-tracking branch 'adambard/master'
# Conflicts:
# python.html.markdown
Diffstat (limited to 'python.html.markdown')
| -rw-r--r-- | python.html.markdown | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/python.html.markdown b/python.html.markdown index 1d6c0a19..70f7f73f 100644 --- a/python.html.markdown +++ b/python.html.markdown @@ -726,7 +726,11 @@ print say(say_please=True) # Can you buy me a beer? Please! I am poor :( * [Python Module of the Week](http://pymotw.com/2/) * [A Crash Course in Python for Scientists](http://nbviewer.ipython.org/5920182) * [First Steps With Python](https://realpython.com/learn/python-first-steps/) +<<<<<<< HEAD * [LearnPython](http://www.learnpython.org/) +======= +* [Fullstack Python](https://www.fullstackpython.com/) +>>>>>>> adambard/master ### Dead Tree |