aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-07-23 14:29:17 -0400
committerJoey Hess <joey@kitenet.net>2010-07-23 14:29:17 -0400
commitd2f56f7dea7252ce8c11b6c58049ecce515f155c (patch)
tree723151784d2dbb8b799185ec0dbbd2172d5b0055 /doc
parentb5bd92e77e9998a59adc9174195af1b46e0c4bca (diff)
downloadikiwiki-d2f56f7dea7252ce8c11b6c58049ecce515f155c.tar
ikiwiki-d2f56f7dea7252ce8c11b6c58049ecce515f155c.tar.gz
merged; notes
Diffstat (limited to 'doc')
-rw-r--r--doc/plugins/po.mdwn4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index ddaba86f0..d70247295 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -304,6 +304,10 @@ to an array to support this. (If twere done, twere best done quickly.)
>>>>> Implemented using the pipe separator, fixed the po.t test suite
>>>>> accordingly. Please have a look. --[[intrigeri]]
+>>>>>> Merged. I wonder if "ll: Lang" would be better than pipe?
+>>>>>> Also, the compatability code for HASH is not really needed,
+>>>>>> ikiwiki has not been released using a hash for it. --[[Joey]]
+
Pagespecs
---------