From 1ed856de54df78fa8987296d7e4576f7227a0753 Mon Sep 17 00:00:00 2001
From: Michel Fortin <michel.fortin@michelf.com>
Date: Thu, 3 Jul 2008 12:05:41 -0400
Subject: [PATCH] Corrected a merge error in PHP Markdown Extra Readme.text.

---
 PHP Markdown Extra Readme.text | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/PHP Markdown Extra Readme.text b/PHP Markdown Extra Readme.text
index d25e887..34964ca 100644
--- a/PHP Markdown Extra Readme.text	
+++ b/PHP Markdown Extra Readme.text	
@@ -1,11 +1,7 @@
 PHP Markdown Extra
 ==================
 
-<<<<<<< HEAD:PHP Markdown Extra Readme.text
-Version 1.2.1 - Tue 27 May 2008
-=======
-Version 1.0.1m - Sat 21 Jun 2008
->>>>>>> master:PHP Markdown Readme.text
+Version 1.2.2 - Sat 21 Jun 2008
 
 by Michel Fortin
 <http://www.michelf.com/>