diff options
| author | sarthfrey <sarth.frey@gmail.com> | 2016-01-25 18:34:25 -0500 |
|---|---|---|
| committer | sarthfrey <sarth.frey@gmail.com> | 2016-01-25 18:34:25 -0500 |
| commit | 39c83718b14a768ed62a6644ed633c9a032ff9f6 (patch) | |
| tree | 3c4bf94f5ac6626617c56f20e9ce9d90e9bc0599 /python.html.markdown | |
| parent | 279c28ce7dcc3f155f71c7a073e939630e8f05b6 (diff) | |
removed merge stuff
Diffstat (limited to 'python.html.markdown')
| -rw-r--r-- | python.html.markdown | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/python.html.markdown b/python.html.markdown index 70f7f73f..2e7fd8be 100644 --- a/python.html.markdown +++ b/python.html.markdown @@ -726,11 +726,8 @@ 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 |