Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[git.ikiwiki.info.git] / doc / bugs / post-commit_hangs.mdwn

diff --git a/doc/bugs/post-commit_hangs.mdwn b/doc/bugs/post-commit_hangs.mdwn
index a013f791906010ac4ed3601052f6794437e0e090..32820d8864476ed5dbcf4d62515577f5faad5c54 100644 (file)
--- a/doc/bugs/post-commit_hangs.mdwn
+++ b/doc/bugs/post-commit_hangs.mdwn
@@ -39,6 +39,8 @@ I installed ikiwiki v3.14159 in /usr/local from tarball (/usr contains an older
 >>>>>>
 >>>>>> I've now changed it to match the example page and it works. Thanks --Ali.
 
+>>>>>>> [[done]]
+
 > Also, how have you arranged to keep it from seeing the installation in /usr? Perl could well be loading
 > modules from the old installation, and if it's one with a different locking strategy that would explain your problem. --[[Joey]]