X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/ddc9441beb0c85e1f7578f4e31c9bf5497955e5e..3ce7d8bfb822cf253724cc3677e54fad5aeb1e2b:/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]]