X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/2f71e7f8f5a5c69753fb77c897d4446cdc23f856..cab8a795682bcac2e937461d9a7d2c683cdc5ed0:/doc/plugins/po.mdwn?ds=sidebyside

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
 ---------