X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/c4cb6e3c346199929b42ab0c352e33b36f55b72e..e200bd33f13c8a1d1c53ce209a4d88905208d49b:/doc/bugs/crashes_in_the_python_proxy_even_if_disabled.mdwn

diff --git a/doc/bugs/crashes_in_the_python_proxy_even_if_disabled.mdwn b/doc/bugs/crashes_in_the_python_proxy_even_if_disabled.mdwn
index 4af8c9f72..3d5b05618 100644
--- a/doc/bugs/crashes_in_the_python_proxy_even_if_disabled.mdwn
+++ b/doc/bugs/crashes_in_the_python_proxy_even_if_disabled.mdwn
@@ -68,3 +68,7 @@ error: ikiwiki failed
 
 > > > > I don't see that branch in your git repo, could you repost it please?
 > > > > (I'm trying to review some of the pending patches.) --[[smcv]]
+
+>>>>> Ooops.. I forgot to push the branch, it should be good now! --[[anarcat]]
+
+>>>>>> [[merged|done]] --[[Joey]]