aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-07-24 05:23:52 -0400
committerJoey Hess <joey@kitenet.net>2010-07-24 05:23:52 -0400
commitcab8a795682bcac2e937461d9a7d2c683cdc5ed0 (patch)
tree2ab1e8eac2808057c84098b7e84361dca30b1673
parent52f09a63a1b5715e3b8f364ebf3518cd1cf27b26 (diff)
downloadikiwiki-cab8a795682bcac2e937461d9a7d2c683cdc5ed0.tar
ikiwiki-cab8a795682bcac2e937461d9a7d2c683cdc5ed0.tar.gz
response
-rw-r--r--doc/plugins/po.mdwn3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 9426ec9c5..5088677c1 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -320,6 +320,9 @@ to an array to support this. (If twere done, twere best done quickly.)
>>>>>>> By the way, could you please have a look to the rest of my po
>>>>>>> branch? (bb22e8c4a..d98296d1db0) --[[intrigeri]]
+>>>>>>>> Thought I'd already merged everything; I've got those in now.
+>>>>>>>> --[[Joey]]
+
Pagespecs
---------