removed merge stuff

This commit is contained in:
sarthfrey 2016-01-25 18:34:25 -05:00
parent 279c28ce7d
commit 39c83718b1

View File

@ -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/) * [Python Module of the Week](http://pymotw.com/2/)
* [A Crash Course in Python for Scientists](http://nbviewer.ipython.org/5920182) * [A Crash Course in Python for Scientists](http://nbviewer.ipython.org/5920182)
* [First Steps With Python](https://realpython.com/learn/python-first-steps/) * [First Steps With Python](https://realpython.com/learn/python-first-steps/)
<<<<<<< HEAD
* [LearnPython](http://www.learnpython.org/) * [LearnPython](http://www.learnpython.org/)
=======
* [Fullstack Python](https://www.fullstackpython.com/) * [Fullstack Python](https://www.fullstackpython.com/)
>>>>>>> adambard/master
### Dead Tree ### Dead Tree