response

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

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 9426ec9c555b4fbc82b8bd1c7d079cf3d31fb7cb..5088677c1c31bfdd645e33d6ec642fb09a11ae75 100644 (file)
--- 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
 ---------