From 7bf68f83f806767bfa8b89ffb83507186a3b1448 Mon Sep 17 00:00:00 2001 From: Timothy Crosley Date: Sun, 1 Sep 2013 16:40:15 -0400 Subject: Updated readme --- README.md | 7 ------- 1 file changed, 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. -- cgit v1.2.1