diff options
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 | 
