summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorTimothy Crosley <timothy.crosley@gmail.com>2013-09-01 16:40:15 -0400
committerTimothy Crosley <timothy.crosley@gmail.com>2013-09-01 16:40:15 -0400
commit7bf68f83f806767bfa8b89ffb83507186a3b1448 (patch)
treea8b3e0856d3e29c005a19258a5e4b3b54854e9df /README.md
parent371e0a19cb5632f464a87eac68d8d1555fc9f83e (diff)
downloadpies-7bf68f83f806767bfa8b89ffb83507186a3b1448.tar.gz
Updated readme
Diffstat (limited to 'README.md')
-rw-r--r--README.md7
1 files changed, 0 insertions, 7 deletions
diff --git a/README.md b/README.md
index f74c096..98ac9c2 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,3 @@
-<<<<<<< Updated upstream
-pies
-====
-=======
pies!
====================
@@ -47,6 +43,3 @@ The following will work unchanged in Python 3 after import (using the Python 2 s
pies will also automatically install and include the most optimal version of OrderedDict for the python environment
in use, so you should remove any other explicit imports of OrderedDict.
->>>>>>> Stashed changes
-
-The simplest way to write one program that runs on both Python 2 and Python 3.