merged; notes

[ikiwiki.git] / doc / plugins / po.mdwn

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index ddaba86f0abb16d39bf92085b0b34de66186ff04..d70247295254164d6fcdd536fa9ec780721587da 100644 (file)
--- 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
 ---------