From 39c83718b14a768ed62a6644ed633c9a032ff9f6 Mon Sep 17 00:00:00 2001
From: sarthfrey <sarth.frey@gmail.com>
Date: Mon, 25 Jan 2016 18:34:25 -0500
Subject: [PATCH] removed merge stuff

---
 python.html.markdown | 3 ---
 1 file changed, 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