Corrected a merge error in PHP Markdown Extra Readme.text.

This commit is contained in:
Michel Fortin 2008-07-03 12:05:41 -04:00
parent 9006c53fcf
commit 1ed856de54

View file

@ -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/>