summaryrefslogtreecommitdiff
path: root/extlib/markdown.php
diff options
context:
space:
mode:
authorSiebrand Mazeland <s.mazeland@xs4all.nl>2009-11-08 23:33:58 +0100
committerSiebrand Mazeland <s.mazeland@xs4all.nl>2009-11-08 23:33:58 +0100
commitb10f362ede8c39746c168363bf4fa6481995592b (patch)
treec7a6d4d2ca280ba50d1dbac1113507432e3fe12e /extlib/markdown.php
parent5ab709b73977131813884558bf56d97172a7aa26 (diff)
parentfc5002015b2a9e16a3c6b9992d55b45c73a8d2fb (diff)
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
Diffstat (limited to 'extlib/markdown.php')
-rw-r--r--extlib/markdown.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/extlib/markdown.php b/extlib/markdown.php
index 1bb1b6ce4..8179b568b 100644
--- a/extlib/markdown.php
+++ b/extlib/markdown.php
@@ -1348,7 +1348,7 @@ class Markdown_Parser {
// {
// list(, $div_open, , $div_content, $div_close) = $matches;
//
-// # We cannot call Markdown(), because that resets the hash;
+// # We can't call Markdown(), because that resets the hash;
// # that initialization code should be pulled into its own sub, though.
// $div_content = $this->hashHTMLBlocks($div_content);
//